Don't invoke "builtin" as an external editor. Note: It's not clear

to me that this is really the right approach.  Revisit Editor/Visual
some time.

1 files changed, 3 insertions, 2 deletions

diff --git a/compose.c b/compose.c
index 8bd93b01..ad9dc222 100644
--- a/compose.c
+++ b/compose.c
@@ -572,8 +572,9 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
 	}
 	/* fall through */
       case OP_COMPOSE_EDIT_HEADERS:
-	if (op == OP_COMPOSE_EDIT_HEADERS ||
-	    (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))
+	if (mutt_strcmp ("builtin", Editor) != 0 &&
+	    (op == OP_COMPOSE_EDIT_HEADERS ||
+	    (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS))))
 	{
 	  char *tag = NULL, *err = NULL;
 	  mutt_env_to_local (msg->env);