diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74f8cf9c7..526234aea 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-18  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-agenda.el (org-agenda-highlight-todo): Fix text property
+	problem.
+
 	* org-mobile.el (org-mobile-capture-file): Use `mobileorg.org' as
 	the capture file, and make it non-configurable.
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 02124a65c..4f084246a 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4784,7 +4784,7 @@ HH:MM."
 	(setq x (concat (substring x 0 (match-end 1))
 			(format org-agenda-todo-keyword-format
 				(match-string 2 x))
-			" "
+			(org-add-props " " (text-properties-at 0 x))
 			(substring x (match-end 3)))))
       x)))