*vc-diff*

diff --git a/identica-mode.el b/identica-mode.el
index 246bfcd..24a0f9a 100644
--- a/identica-mode.el
+++ b/identica-mode.el
@@ -600,7 +600,11 @@ of identica-stripe-face."
     `((t nil)) "" :group 'faces)
   (set-face-attribute 'identica-uri-face nil :underline t)
   (add-to-list 'minor-mode-alist '(identica-icon-mode " id-icon"))
-  (add-to-list 'minor-mode-alist '(identica-scroll-mode " id-scroll")))
+  (add-to-list 'minor-mode-alist '(identica-scroll-mode " id-scroll"))
+
+  ;; If we are displaying images in the margin, give them some room
+  (set-window-margins nil 7) 
+)
 
 (defmacro case-string (str &rest clauses)
   `(cond
@@ -1031,7 +1035,7 @@ we are interested in."
 		    ;; Make sure the avatar is 48 pixels (which it should already be!, but hey...)
 		    ;; For offenders, the top left slice of 48 by 48 pixels is displayed
 		    ;; TODO: perhaps make this configurable?
-		    (insert-image avatar nil nil `(0 0 48 48)))
+		    (insert-image avatar nil `left-margin `(0 0 48 48)))
 		  nil))))))
     (let ((cursor 0)
 	  (result ())