X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=3e52d5e2979f8995c33aa2b0b5b4763c536414df;hp=934f6c95e8d4ec5c68fff40e1fac2c1b5ed42da9;hb=3c1eea5646fcf33d66acb874d82f3518a75c24de;hpb=0c565fa29fc29f74209d4343e2fc88f3b8008aaa

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 934f6c95..3e52d5e2 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -118,7 +118,10 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
 
 (defun notmuch-mua-user-agent-notmuch ()
   "Generate a `User-Agent:' string suitable for notmuch."
-  (concat "Notmuch/" (notmuch-cli-version) " (http://notmuchmail.org)"))
+  (let ((notmuch-version (if (string= notmuch-emacs-version "unknown")
+			     (notmuch-cli-version)
+			   notmuch-emacs-version)))
+    (concat "Notmuch/" notmuch-version " (http://notmuchmail.org)")))
 
 (defun notmuch-mua-user-agent-emacs ()
   "Generate a `User-Agent:' string suitable for notmuch."