diff --git a/ChangeLog b/ChangeLog
index 2910b9df..26bf8a52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ $Id$
 
 v0.83.13	13-Feb-2006
 
+	mbsebbs:
+		Writes LINES and COLUMNS environment into data.msg so that the
+		joe editor can use that.
+
 
 v0.83.12	06-Feb-2006 - 13-Feb-2006
 
diff --git a/mbsebbs/mail.c b/mbsebbs/mail.c
index 4dcdd1de..fff448a4 100644
--- a/mbsebbs/mail.c
+++ b/mbsebbs/mail.c
@@ -2825,6 +2825,8 @@ int Ext_Edit()
 	fprintf(fd,"MSGSUBJECT='%s'\n",Msg.Subject);
 	fprintf(fd,"BBSLANGUAGE='%c'\n",exitinfo.iLanguage);
 	fprintf(fd,"BBSFSEDKEYS='%d'\n",exitinfo.FSemacs);
+	fprintf(fd,"LINES='%d'\n",rows);
+	fprintf(fd,"COLUMNS='80'\n");
 	fclose(fd);
     }