diff --git a/.emacs.d/lisp/init-mu4e.el b/.emacs.d/lisp/init-mu4e.el
index f5f79437..c39300c8 100644
--- a/.emacs.d/lisp/init-mu4e.el
+++ b/.emacs.d/lisp/init-mu4e.el
@@ -336,9 +336,12 @@ This function could be useful in `mu4e-compose-mode-hook'."
 ;;; Org captures
 (when (require 'org-mu4e nil t)
   (require 'init-org)                   ; For org-agenda-files
+  (defun ambrevar/org-mail-date (&optional msg)
+    (with-current-buffer (mu4e-get-headers-buffer)
+      (mu4e-message-field (or msg (mu4e-message-at-point)) :date)))
   (add-to-list 'org-capture-templates
                `("t" "Mark e-mail in agenda" entry (file+headline ,(car org-agenda-files) "E-mails")
-                 "* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n"))
+                 "* %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"++7d\" nil (ambrevar/org-mail-date)))\n%a\n"))
 
   ;; TODO: Don't duplicate contacts.
   (defun ambrevar/mu4e-contact-dwim ()