--- Desktop/twit.el	2009-06-18 13:47:48.000000000 +0100
+++ u/lib/emacs/twit.el	2009-06-18 08:01:52.000000000 +0100
@@ -663,7 +663,7 @@
         :weight bold
         :height 2.0
         :foreground "gold1"))
-      (t (:underline white)))
+      (t (:underline "white")))
   "Face for displaying the favorite"
   :group 'twit)
 
@@ -1399,22 +1399,31 @@
 		  (insert-image user-img)
 		  (insert " "))
 
-	(insert " ")
 	(if (string-equal "true" favorite)
 		(twit-insert-with-overlay-attributes "*" '((face . "twit-favorite-face")))
-		(insert "  "))
-	(insert " ")
+		(insert " "))
 		  
 	(twit-insert-with-overlay-attributes (concat user-id
 												 (if user-name
 													 (concat " (" user-name ")")
-													 "")
-												 " ")
+													 ""))
 										 `((face . "twit-author-face")))
 	(insert ": ")
-	(twit-insert-with-overlay-attributes (twit-keymap-and-fontify-message message)
-										 '((face . "twit-message-face"))
-										 " ")
+	(let* ((prefix-length
+			(- (point) (save-excursion
+						 (beginning-of-line)
+						 (point))))
+		   (message
+			(with-temp-buffer
+			 (let ((fill-column (- (window-width) 2)))
+			   (dotimes (a prefix-length)
+				 (insert " "))
+			   (insert message)
+			   (fill-region (point-min) (point-max))
+			   (buffer-substring (+ prefix-length 1) (point-max))))))
+	  (twit-insert-with-overlay-attributes (twit-keymap-and-fontify-message message)
+										   '((face . "twit-message-face"))
+										   " "))
 
 	(insert "\n")
 	(when (or timestamp location src-info)
@@ -1425,6 +1434,7 @@
 				   (when src-info (concat " (" src-info ")"))
 				   "\n")
 		   '((face . "twit-info-face")) "" 'right))
+	(insert "\n")
 	(setq overlay-end (point))
 	(let ((o (make-overlay overlay-start overlay-end)))
 	  (overlay-put o