1 files changed, 2 insertions, 1 deletions
diff --git a/editmsg.c b/editmsg.c
index e2b9a4a3..7294cd80 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -87,7 +87,8 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur)
   if (stat (tmp, &sb) == 0)
     mtime = sb.st_mtime;
 
-  mutt_edit_file (NONULL (Visual), tmp);
+  mutt_edit_file ((!Editor || mutt_strcmp ("builtin", Editor) == 0) ? 
+		  NONULL(Visual) : NONULL(Editor), tmp);
 
   if ((rc = stat (tmp, &sb)) == -1)
   {