diff --git a/contrib/lisp/org-notmuch.el b/contrib/lisp/org-notmuch.el
index 0affd71cb..1abb13d67 100644
--- a/contrib/lisp/org-notmuch.el
+++ b/contrib/lisp/org-notmuch.el
@@ -54,9 +54,22 @@
 	   (subject (notmuch-show-get-subject))
 	   (to (notmuch-show-get-to))
 	   (from (notmuch-show-get-from))
+	   (date (notmuch-show-get-date))
+	   (date-ts (and date
+                         (ignore-errors
+                           (format-time-string
+                            (org-time-stamp-format t)
+                            (date-to-time date)))))
+           (date-ts-ia (and date
+                            (ignore-errors
+                              (format-time-string
+                               (org-time-stamp-format t t)
+                               (date-to-time date)))))
 	   desc link)
       (org-store-link-props :type "notmuch" :from from :to to
-       			    :subject subject :message-id message-id)
+       			    :subject subject :message-id message-id
+			    :date date :date-timestamp date-ts
+                            :date-timestamp-inactive date-ts-ia))
       (setq desc (org-email-link-description))
       (setq link (concat "notmuch:"  "id:" message-id))
       (org-add-link-props :link link :description desc)