X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-maildir-fcc.el;h=aede753702d01e8d2de62984690d676824cffce2;hp=e5e0549be8e10248cd4587b67919e19e724bbc38;hb=a0f09b4942b7fdb852b45856e3439acac2649035;hpb=ea1c2bb5c5ab7115e3259d2e66e19398ce4cc19f

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index e5e0549b..aede7537 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -80,7 +80,7 @@ will NOT be removed or replaced."
   (let ((subdir
 	 (cond
 	  ((or (not notmuch-fcc-dirs)
-	       (message-fetch-field "Fcc"))
+	       (message-field-value "Fcc"))
 	   ;; Nothing set or an existing header.
 	   nil)
 
@@ -93,7 +93,7 @@ will NOT be removed or replaced."
 	   (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
 
 	  ((listp notmuch-fcc-dirs)
-	   (let* ((from (message-fetch-field "From"))
+	   (let* ((from (message-field-value "From"))
 		  (match
 		   (catch 'first-match
 		     (dolist (re-folder notmuch-fcc-dirs)
@@ -110,14 +110,15 @@ will NOT be removed or replaced."
     (when subdir
       (message-add-header
        (concat "Fcc: "
-	       ;; If the resulting directory is not an absolute path,
-	       ;; prepend the standard notmuch database path.
-	       (if (= (elt subdir 0) ?/)
-		   subdir
-		 (concat (notmuch-database-path) "/" subdir))))
+	       (file-truename
+		;; If the resulting directory is not an absolute path,
+		;; prepend the standard notmuch database path.
+		(if (= (elt subdir 0) ?/)
+		    subdir
+		  (concat (notmuch-database-path) "/" subdir)))))
       
       ;; finally test if fcc points to a valid maildir
-      (let ((fcc-header (message-fetch-field "Fcc")))
+      (let ((fcc-header (message-field-value "Fcc")))
 	(unless (notmuch-maildir-fcc-dir-is-maildir-p fcc-header)
 	  (cond ((not (file-writable-p fcc-header))
 		 (error (format "No permission to create %s, which does not exist"