diff --git a/ChangeLog b/ChangeLog
index 0f6dbd85..463ec6ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@ v0.61.4		11-Aug-2004
 		delay just like all other execute functions to prevent problems
 		on fast machines.
 		Added extra fflush in quickscan mail.
+		When calling the external editor, the fromaddress if available
+		is given to joe.
 
 	mbuser:
 		Fixed permissions.
@@ -48,6 +50,11 @@ v0.61.4		11-Aug-2004
 		Changed nodes screens to have a separate uplink managers setup
 		screen, and added switches for BBBS uplinks.
 
+	script:
+		In the editor script (that calls joe) made a fix for screens
+		wider then 80 characters. Also fixed the joe path if it should
+		run in emacs mode. Added FromAddress in the header.
+
 
 v0.61.3		25-Jul-2004 - 11-Aug-2004
 
diff --git a/mbsebbs/mail.c b/mbsebbs/mail.c
index 0c525bdb..86c5e898 100644
--- a/mbsebbs/mail.c
+++ b/mbsebbs/mail.c
@@ -2811,7 +2811,7 @@ int Ext_Edit()
 
     tmpname = calloc(PATH_MAX, sizeof(char));
 
-    sprintf(tmpname, "%s/%s/%s", CFG.bbs_usersdir, exitinfo.Name, "data.msg");
+    sprintf(tmpname, "%s/%s/data.msg", CFG.bbs_usersdir, exitinfo.Name);
     if ((fd = fopen(tmpname, "w")) == NULL) {
 	Syslog('+',"EXT_EDIT: Unable to open %s for writing", tmpname);
     } else {
@@ -2819,6 +2819,7 @@ int Ext_Edit()
 	fprintf(fd,"AREANUM='%d'\n",iMsgAreaNumber+1);
 	fprintf(fd,"AREATYPE='%d'\n",iMsgAreaType);
 	fprintf(fd,"MSGFROM='%s'\n",Msg.From);
+	fprintf(fd,"MSGFROMADDR='%s'\n",Msg.FromAddress);
 	fprintf(fd,"MSGTO='%s'\n",Msg.To);
 	fprintf(fd,"MSGTOADDR='%s'\n",Msg.ToAddress);
 	fprintf(fd,"MSGSUBJECT='%s'\n",Msg.Subject);
@@ -2827,7 +2828,7 @@ int Ext_Edit()
 	fclose(fd);
     }
 
-    sprintf(tmpname, "%s/%s/%s", CFG.bbs_usersdir, exitinfo.Name, "edit.msg");
+    sprintf(tmpname, "%s/%s/edit.msg", CFG.bbs_usersdir, exitinfo.Name);
     if ((fd = fopen(tmpname, "w")) == NULL) {
 	Syslog('+',"EXT_EDIT: Unable to open %s for writing", tmpname);
     } else {
diff --git a/script/editor.in b/script/editor.in
index e5770bfd..7da43f8c 100644
--- a/script/editor.in
+++ b/script/editor.in
@@ -32,7 +32,7 @@ PARAM="~/edit.msg"
 # uncomment next line. If user select Emacs keys then this
 # editor was selected.
 
-if [ "BBSFSEDKEYS" = "1" ]; then EDITOR=/usr/bin/bbsjmacs; fi
+if [ "BBSFSEDKEYS" = "1" ]; then EDITOR=@joebin@/bbsjmacs; fi
 
 
 ## Setting Language environmment for msg header
@@ -67,7 +67,7 @@ case $BBSLANGUAGE in
 	 ;;
      ## Dutch
      N)
-         LANGAREA='Gebied'
+         LANGAREA='GEBIED'
 	 LANGFROM='Van      '
 	   LANGTO='Aan      '
 	   LANGRE='Onderwerp'
@@ -76,9 +76,9 @@ case $BBSLANGUAGE in
      ## Languages not set defaults to english.
      *)
          LANGAREA='AREA'
-         LANGFROM='FROM    '
-           LANGTO='TO      '
-           LANGRE='SUBJECT '
+         LANGFROM='From    '
+           LANGTO='To      '
+           LANGRE='Subject '
          ;;
 esac
 
@@ -87,12 +87,12 @@ alarma $TIME $EDITOR &
 
 ## Draw header and call editor
 clear
-echo "                                                                               
+echo -e "                                                                               
 $LANGAREA: $AREANUM $AREA
- $LANGFROM: $MSGFROM
- $LANGTO: $MSGTO $MSGTOADDR
- $LANGRE: $MSGSUBJECT
- "
+\n$LANGFROM: $MSGFROM $MSGFROMADDR
+\n$LANGTO: $MSGTO $MSGTOADDR
+\n$LANGRE: $MSGSUBJECT
+\n"
 $EDITOR $PARAM
 ## kill alarm
 killall sleep >/dev/null 2>&1