X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=1bc3b3196ecdf8331fbee59d83c3058db4fae1d8;hb=1ef7c75111b84ea19af3186ddc12f2ba434c93de;hp=05524c2eec0a372db4b3097a14488d9428c69516;hpb=5ea5a5557d9ad4cef67e61a83bb81abd44dc7f76;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 05524c2e..1bc3b319 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -555,7 +555,7 @@ message at DEPTH in the current thread."
      (if (> file-count 1)
 	 (let ((txt (format "%d/%d\n" duplicate file-count)))
 	   (concat
-	    (notmuch-show-spaces-n (- (window-width) (+ (current-column) (length txt))))
+	    (notmuch-show-spaces-n (max 0 (- (window-width) (+ (current-column) (length txt)))))
 	    txt))
        "\n"))
     (overlay-put (make-overlay start (point))
@@ -2020,13 +2020,15 @@ any effects from previous calls to
 (defun notmuch-show-reply (&optional prompt-for-sender)
   "Reply to the sender and all recipients of the current message."
   (interactive "P")
-  (notmuch-mua-new-reply (notmuch-show-get-message-id) prompt-for-sender t))
+  (notmuch-mua-new-reply (notmuch-show-get-message-id) prompt-for-sender t
+			 (notmuch-show-get-prop :duplicate)))
 
 (put 'notmuch-show-reply-sender 'notmuch-prefix-doc "... and prompt for sender")
 (defun notmuch-show-reply-sender (&optional prompt-for-sender)
   "Reply to the sender of the current message."
   (interactive "P")
-  (notmuch-mua-new-reply (notmuch-show-get-message-id) prompt-for-sender nil))
+  (notmuch-mua-new-reply (notmuch-show-get-message-id) prompt-for-sender nil
+			 (notmuch-show-get-prop :duplicate)))
 
 (put 'notmuch-show-forward-message 'notmuch-prefix-doc
      "... and prompt for sender")