diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 8d5d26b85..656ff49c2 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -348,6 +348,14 @@ This is the compiled version of the format.")
        (org-overlay-put ov 'org-columns-pom pom)
        (org-overlay-put ov 'org-columns-format f)
        (when (featurep 'xemacs)
+	 (if (or (not (char-after beg))
+		 (equal (char-after beg) ?\n))
+	     (let ((inhibit-read-only t))
+	       (save-excursion
+		 (goto-char beg)
+		 (org-unmodified (insert " "))
+		 ;; FIXME: add props and remove later?
+		 )))
          (goto-char beg)
          (org-columns-new-overlay
           beg (1+ beg) nil 'org-columns-space)
diff --git a/lisp/org.el b/lisp/org.el
index da09c4b8d..6fd7d7140 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9695,6 +9695,8 @@ formats in the current buffer."
     (setq hiddenp (org-invisible-p))
     (end-of-line 1)
     (and (equal (char-after) ?\n) (forward-char 1))
+    (while (looking-at "^[ \t]*\\(:CLOCK:\\|CLOCK\\|:END:\\)")
+      (beginning-of-line 2))
     (org-skip-over-state-notes)
     (skip-chars-backward " \t\n\r")
     (if (eq (char-before) ?*) (forward-char 1))