diff --git a/ChangeLog b/ChangeLog
index 14e5326e..54b11c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,10 @@ v0.37.4		10-May-2003
 		risk of sending files back to the owner of that faulty program.
 		Added the same check for Seenby lines.
 
+	mbsebbs:
+		Increased internal message buffer size to 700 lines.
+		Fullscreen editor code cleanup, debug messages removed.
+
 
 v0.37.3		09-Apr-2003 - 10-May-2003
 
diff --git a/mbsebbs/fsedit.c b/mbsebbs/fsedit.c
index 4d672185..1a94c1a0 100644
--- a/mbsebbs/fsedit.c
+++ b/mbsebbs/fsedit.c
@@ -4,7 +4,7 @@
  * Purpose ...............: FullScreen Message editor.
  *
  *****************************************************************************
- * Copyright (C) 1997-2002
+ * Copyright (C) 1997-2003
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -48,121 +48,121 @@
 
 void Show_Ins(void)
 {
-	locate(1, 70);
-	colour(YELLOW, BLUE);
-	printf("%s", InsMode ? "INS": "OVR");
-	fflush(stdout);
+    locate(1, 70);
+    colour(YELLOW, BLUE);
+    printf("%s", InsMode ? "INS": "OVR");
+    fflush(stdout);
 }
 
 
 void Top_Help() 
 {
-	locate(1,1);
-	colour(YELLOW, BLUE);
-	printf("%s", padleft((char *)"Press ESC for menu, other keys is edit text", 80, ' '));
-	Show_Ins();
+    locate(1,1);
+    colour(YELLOW, BLUE);
+    printf("%s", padleft((char *)"Press ESC for menu, other keys is edit text", 80, ' '));
+    Show_Ins();
 }
 
 
 void Top_Menu(void)
 {
-	locate(1,1);
-	colour(WHITE, RED);
-	printf("%s", padleft((char *)"(A)bort (H)elp (S)ave - Any other key is continue edit", 80, ' '));
-	fflush(stdout);
+    locate(1,1);
+    colour(WHITE, RED);
+    printf("%s", padleft((char *)"(A)bort (H)elp (S)ave - Any other key is continue edit", 80, ' '));
+    fflush(stdout);
 }
 
 
 void Ls(int a, int y)
 {
-	locate(y, 10);
-	printf("%c ", a ? 179 : '|');
+    locate(y, 10);
+    printf("%c ", a ? 179 : '|');
 }
 
 
 void Rs(int a)
 {
-	colour(LIGHTGREEN, BLUE);
-	printf("%c", a ? 179 : '|');
+    colour(LIGHTGREEN, BLUE);
+    printf("%c", a ? 179 : '|');
 }
 
 
 void Ws(int a, int y)
 {
-	int	i;
+    int	i;
 
-	Ls(a, y);
-	for (i = 0; i < 57; i++)
-		printf(" ");
-	Rs(a);
+    Ls(a, y);
+    for (i = 0; i < 57; i++)
+	printf(" ");
+    Rs(a);
 }
 
 
 void Hl(int a, int y, char *txt)
 {
-	Ls(a, y);
-	colour(WHITE, BLUE);
-	printf("%s", padleft(txt, 57, ' '));
-	Rs(a);
+    Ls(a, y);
+    colour(WHITE, BLUE);
+    printf("%s", padleft(txt, 57, ' '));
+    Rs(a);
 }
 
 
 void Full_Help(void)
 {
-	int	a, i;
+    int	    a, i;
 
-	a = exitinfo.GraphMode;
+    a = exitinfo.GraphMode;
 
-	colour(LIGHTGREEN, BLUE);
+    colour(LIGHTGREEN, BLUE);
 
-	/* Top row */
-	locate(1, 10);
-	printf("%c", a ? 213 : '+');
-	for (i = 0; i < 58; i++)
-		printf("%c", a ? 205 : '=');
-	printf("%c", a ? 184 : '+');
+    /* Top row */
+    locate(1, 10);
+    printf("%c", a ? 213 : '+');
+    for (i = 0; i < 58; i++)
+	printf("%c", a ? 205 : '=');
+    printf("%c", a ? 184 : '+');
 
-	Ws(a, 2);
+    Ws(a, 2);
 
-	Ls(a, 3);
-	colour(YELLOW, BLUE);
-	printf("%s", padleft((char *)"                  Editor Help", 57, ' '));
-	Rs(a);
+    Ls(a, 3);
+    colour(YELLOW, BLUE);
+    printf("%s", padleft((char *)"                  Editor Help", 57, ' '));
+    Rs(a);
 
-	Ws(a,  4);
-	Hl(a,  5, (char *)"Ctrl-S or LeftArrow     - Cursor left");
-	Hl(a,  6, (char *)"Ctrl-D or RightArrow    - Cursor right");
-	Hl(a,  7, (char *)"Ctrl-E or UpArrow       - Cursor up");
-	Hl(a,  8, (char *)"Ctrl-X or DownArrow     - Cursor down");
-	Hl(a,  9, (char *)"Ctrl-V or Insert        - Insert or Overwrite");
-	Hl(a, 10, (char *)"Ctrl-N                  - Insert line");
-	Hl(a, 11, (char *)"Ctrl-Y                  - Delete line");
-	Ws(a, 12);
-	Hl(a, 13, (char *)"Ctrl-L                  - Refresh screen");
-	Hl(a, 14, (char *)"Ctrl-R                  - Read from file");
-	Ws(a, 15);
+    Ws(a,  4);
+    Hl(a,  5, (char *)"Ctrl-S or LeftArrow     - Cursor left");
+    Hl(a,  6, (char *)"Ctrl-D or RightArrow    - Cursor right");
+    Hl(a,  7, (char *)"Ctrl-E or UpArrow       - Cursor up");
+    Hl(a,  8, (char *)"Ctrl-X or DownArrow     - Cursor down");
+    Hl(a,  9, (char *)"Ctrl-V or Insert        - Insert or Overwrite");
+    Hl(a, 10, (char *)"Ctrl-N                  - Insert line");
+    Hl(a, 11, (char *)"Ctrl-Y                  - Delete line");
+    Ws(a, 12);
+    Hl(a, 13, (char *)"Ctrl-L                  - Refresh screen");
+    Hl(a, 14, (char *)"Ctrl-R                  - Read from file");
+    Ws(a, 15);
 
-	locate(16,10);
-	printf("%c", a ? 212 : '+');
-	for (i = 0; i < 58; i++)
-		printf("%c", a ? 205 : '=');
-	printf("%c", a ? 190 : '+');
-	fflush(stdout);
+    locate(16,10);
+    printf("%c", a ? 212 : '+');
+    for (i = 0; i < 58; i++)
+	printf("%c", a ? 205 : '=');
+    printf("%c", a ? 190 : '+');
+    fflush(stdout);
 }
 
 
 void Setcursor(void)
 {
-	CurRow = Row + TopVisible - 1;
-	locate(Row + 1, Col);
-	fflush(stdout);
+    CurRow = Row + TopVisible - 1;
+    locate(Row + 1, Col);
+    fflush(stdout);
 }
 
 
 void Beep(void)
 {
-	printf("\007");
-	fflush(stdout);
+    printf("\007");
+    fflush(stdout);
 }
 
 
@@ -171,489 +171,464 @@ void Beep(void)
  */
 void Refresh(void) 
 {
-	int	i, j = 2;
+    int	    i, j = 2;
 
-	clear();
-	Top_Help();
-	locate(j,1);
-	colour(CFG.TextColourF, CFG.TextColourB);
+    clear();
+    Top_Help();
+    locate(j,1);
+    colour(CFG.TextColourF, CFG.TextColourB);
 
-	for (i = 1; i <= Line; i++) {
-		if ((i >= TopVisible) && (i < (TopVisible + exitinfo.iScreenLen -1))) {
-			locate(j, 1);
-			j++;
-			printf("%s", Message[i]);
-		}
+    for (i = 1; i <= Line; i++) {
+	if ((i >= TopVisible) && (i < (TopVisible + exitinfo.iScreenLen -1))) {
+	    locate(j, 1);
+	    j++;
+	    printf("%s", Message[i]);
 	}
-	Setcursor();
+    }
+    Setcursor();
 }
 
 
-void Debug(void)
-{
-/* 	Syslog('b', "FSEDIT: Col=%d Row=%d TopVisible=%d Lines=%d CurRow=%d Len=%d",  */
-/* 		Col, Row, TopVisible, Line, Row+TopVisible-1, strlen(Message[Row+TopVisible-1])); */
-}
-
 
 void GetstrLC(char *sStr, int iMaxlen)
 {
-	unsigned char	ch = 0;
-	int		iPos = 0;
+    unsigned char   ch = 0;
+    int		    iPos = 0;
 
-	strcpy(sStr, "");
-	alarm_on();
+    strcpy(sStr, "");
+    alarm_on();
 
-	while (ch != 13) {
+    while (ch != 13) {
 
-		fflush(stdout);
-		ch = Readkey();
+	fflush(stdout);
+	ch = Readkey();
 
-		if ((ch == 8) || (ch == KEY_DEL) || (ch == 127)) {
-			if (iPos > 0) {
-				printf("\b \b");
-				sStr[--iPos] = '\0';
-			} else
-				putchar('\007');
-		}
-
-		if (ch > 31 && ch < 127) {
-			if (iPos <= iMaxlen) {
-				iPos++;
-				sprintf(sStr, "%s%c", sStr, ch);
-				printf("%c", ch);
-			} else
-				putchar('\007');
-		}
+	if ((ch == 8) || (ch == KEY_DEL) || (ch == 127)) {
+	    if (iPos > 0) {
+		printf("\b \b");
+		sStr[--iPos] = '\0';
+	    } else {
+		Beep();
+	    }
 	}
 
-	printf("\n");
+	if (ch > 31 && ch < 127) {
+	    if (iPos <= iMaxlen) {
+		iPos++;
+		sprintf(sStr, "%s%c", sStr, ch);
+		printf("%c", ch);
+	    } else {
+		Beep();
+	    }
+	}
+    }
+
+    printf("\n");
 }
 
 
 void ScrollUp()
 {
-	Syslog('b', "FSEDIT: Scroll up");
-	if (TopVisible > 12) {
-		TopVisible -= 12;
-		Row += 12;
-	} else {
-		Row += TopVisible - 1;
-		TopVisible = 1;
-	}
-	Refresh();
-	/* Debug(); */
+    if (TopVisible > 12) {
+	TopVisible -= 12;
+	Row += 12;
+    } else {
+	Row += TopVisible - 1;
+	TopVisible = 1;
+    }
+    Refresh();
 }
 
 
 void ScrollDown()
 {
-	Syslog('b', "FSEDIT: Scroll down");
-	if ((TopVisible + 12) <= Line) {
-		Row -= 12;
-		TopVisible += 12;
-	}
-	Refresh();
-	/* Debug(); */
+    if ((TopVisible + 12) <= Line) {
+	Row -= 12;
+	TopVisible += 12;
+    }
+    Refresh();
 }
 
+
 void FsMove(unsigned char Direction)
 {
-	switch (Direction) {
+    switch (Direction) {
 	case KEY_RIGHT:
-		Syslog('b', "FSEDIT: Cursor Right");
-		Debug();
-		/* 
-		 * FIXME: FsMove KEY_RIGHT
-		 * Handle long lines better.
-		 * For now, we will just refuse to go past col 80
-		 */
-		if ((Col <= strlen(Message[CurRow])) && (Col < 80)){
-			Col++;
-			Setcursor();
-		} else if (Row < (Line - TopVisible +1)) {
-			Row++;
-			Col = 1;
-			if (Row > (exitinfo.iScreenLen -1)) ScrollDown();
-			Refresh();
-		} else
-			Beep();
-		break;
-
-	case KEY_LEFT:
-		Syslog('b', "FSEDIT: Cursor left");
-		Debug();
-		if (Col > 1) {
-			Col--;
-			Setcursor();
-		} else if (CurRow > 1) {
-			Col = strlen(Message[CurRow-1]) +1;
 			/* 
-			 * FIXME: FsMove KEY_LEFT
+			 * FIXME: FsMove KEY_RIGHT
 			 * Handle long lines better.
 			 * For now, we will just refuse to go past col 80
 			 */
-			if (Col > 80) Col = 80;
-			if (Row == 1) ScrollUp();
-			Row--;
-			Setcursor();
-		} else
-			Beep();
-		break;
+			if ((Col <= strlen(Message[CurRow])) && (Col < 80)){
+			    Col++;
+			    Setcursor();
+			} else if (Row < (Line - TopVisible +1)) {
+			    Row++;
+			    Col = 1;
+			    if (Row > (exitinfo.iScreenLen -1)) ScrollDown();
+				Refresh();
+			} else
+			    Beep();
+			break;
+
+	case KEY_LEFT:
+			if (Col > 1) {
+			    Col--;
+			    Setcursor();
+			} else if (CurRow > 1) {
+			    Col = strlen(Message[CurRow-1]) +1;
+			    /* 
+			     * FIXME: FsMove KEY_LEFT
+			     * Handle long lines better.
+			     * For now, we will just refuse to go past col 80
+			     */
+			    if (Col > 80) 
+				Col = 80;
+			    if (Row == 1) 
+				ScrollUp();
+			    Row--;
+			    Setcursor();
+			} else
+			    Beep();
+			break;
 
 	case KEY_UP:
-		Syslog('b', "FSEDIT: Cursor up");
-		Debug();
-		if (CurRow > 1) {
-			Row--;
-			if (Col > strlen(Message[CurRow-1]) + 1)
+			if (CurRow > 1) {
+			    Row--;
+			    if (Col > strlen(Message[CurRow-1]) + 1)
 				Col = strlen(Message[CurRow-1]) +1;
-			if ((Row < 1) && (CurRow != Row))
+			    if ((Row < 1) && (CurRow != Row))
 				ScrollUp();
-			else
+			    else
 				Setcursor();
-		} else
-			Beep();
-		break;
+			} else
+			    Beep();
+			break;
 
 	case KEY_DOWN:
-		Syslog('b', "FSEDIT: Cursor down");
-		Debug();
-		if (Row < (Line - TopVisible + 1)) {
-			Row++;
-			if (Col > strlen(Message[CurRow+1]) + 1)
+			if (Row < (Line - TopVisible + 1)) {
+			    Row++;
+			    if (Col > strlen(Message[CurRow+1]) + 1)
 				Col = strlen(Message[CurRow+1]) + 1;
-			if (Row <= (exitinfo.iScreenLen -1))
+			    if (Row <= (exitinfo.iScreenLen -1))
 				Setcursor();
-			else
+			    else
 				ScrollDown();
-		} else
-			Beep();
-		break;
-	}
+			} else
+			    Beep();
+			break;
+    }
 }
 
+
+
 int FsWordWrap()
 {
-	int WCol, i = 0;
-	unsigned char tmpLine[80];
-	tmpLine[0] = '\0';
+    int		    WCol, i = 0;
+    unsigned char   tmpLine[80];
+    tmpLine[0]	    = '\0';
 
-	/*
-	 * FIXME: FsWordWrap
-	 * The word wrap still fails the BIG WORD test
-	 * (BIG WORD = continuous string of characters that spans multiple
-	 *             lines without any spaces)
-	 */
+    /*
+     * FIXME: FsWordWrap
+     * The word wrap still fails the BIG WORD test
+     * (BIG WORD = continuous string of characters that spans multiple
+     *             lines without any spaces)
+     */
 	
-	Syslog('b', "FSEDIT: Word Wrap");
-	WCol = 79;
-	while (Message[CurRow][WCol] != ' ' && WCol > 0)
-		WCol--;
-	if ((WCol > 0) && (WCol < 80)) WCol++; else WCol=80;
-	if (WCol <= strlen(Message[CurRow])) {
-		/*
-		 * If WCol = 80 (no spaces in line) be sure to grab
-		 * character 79.  Otherwise, drop it, because it's a space.
-		 */
-		if ((WCol == 80) || (WCol-1 == Col))
-			sprintf(tmpLine, "%s%c", tmpLine, Message[CurRow][79]);
-		/*
-		 * Grab all characters from WCol to end of line.
-		 */
-		for (i = WCol; i < strlen(Message[CurRow]); i++) {
-			sprintf(tmpLine, "%s%c", tmpLine, Message[CurRow][i]);
-		}
-		/*
-		 * Truncate current row.
-		 */
-		Message[CurRow][WCol-1] = '\0';
-		/* 
-		 * If this is the last line, then be sure to create a
-		 * new line.x
-		 */
-		if (CurRow >= Line) {
-			Line = CurRow+1;
-			Message[CurRow+1][0] = '\0';
-		}
-		/*
-		 * If the wrapped section and the next row will not fit on
-		 * one line, shift all lines down one and use the wrapped
-		 * section to create a new line.
-		 *
-		 * Otherwise, slap the wrapped section on the front of the
-		 * next row with a space if needed.
-		 */
-		if ((strlen(tmpLine) + strlen(Message[CurRow+1])) > 79) {
-			for (i = Line; i > CurRow; i--)
-				sprintf(Message[i+1], "%s", Message[i]);
-			sprintf(Message[CurRow+1], "%s", tmpLine);
-			Line++;
-			WCol = strlen(tmpLine) + 1;
-		} else {
-			if ((WCol == 80) && (Col >= WCol))
-				WCol = strlen(tmpLine)+1; 
-			else {
-				if (tmpLine[strlen(tmpLine)] != ' ')
-					sprintf(tmpLine, "%s ", tmpLine);
-				WCol = strlen(tmpLine);
-			}
-			sprintf(Message[CurRow+1], "%s", strcat(tmpLine, Message[CurRow+1]));
-		}
+    Syslog('b', "FSEDIT: Word Wrap");
+    WCol = 79;
+    while (Message[CurRow][WCol] != ' ' && WCol > 0)
+	WCol--;
+    if ((WCol > 0) && (WCol < 80)) 
+	WCol++; 
+    else 
+	WCol=80;
+    if (WCol <= strlen(Message[CurRow])) {
+	/*
+	 * If WCol = 80 (no spaces in line) be sure to grab
+	 * character 79.  Otherwise, drop it, because it's a space.
+	 */
+	if ((WCol == 80) || (WCol-1 == Col))
+	    sprintf(tmpLine, "%s%c", tmpLine, Message[CurRow][79]);
+	/*
+	 * Grab all characters from WCol to end of line.
+	 */
+	for (i = WCol; i < strlen(Message[CurRow]); i++) {
+	    sprintf(tmpLine, "%s%c", tmpLine, Message[CurRow][i]);
 	}
+	/*
+	 * Truncate current row.
+	 */
+	Message[CurRow][WCol-1] = '\0';
+	/* 
+	 * If this is the last line, then be sure to create a
+	 * new line.x
+	 */
+	if (CurRow >= Line) {
+	    Line = CurRow+1;
+	    Message[CurRow+1][0] = '\0';
+	}
+	/*
+	 * If the wrapped section and the next row will not fit on
+	 * one line, shift all lines down one and use the wrapped
+	 * section to create a new line.
+	 *
+	 * Otherwise, slap the wrapped section on the front of the
+	 * next row with a space if needed.
+	 */
+	if ((strlen(tmpLine) + strlen(Message[CurRow+1])) > 79) {
+	    for (i = Line; i > CurRow; i--)
+		sprintf(Message[i+1], "%s", Message[i]);
+	    sprintf(Message[CurRow+1], "%s", tmpLine);
+	    Line++;
+	    WCol = strlen(tmpLine) + 1;
+	} else {
+	    if ((WCol == 80) && (Col >= WCol))
+		WCol = strlen(tmpLine)+1; 
+	    else {
+		if (tmpLine[strlen(tmpLine)] != ' ')
+		    sprintf(tmpLine, "%s ", tmpLine);
+		WCol = strlen(tmpLine);
+	    }
+	    sprintf(Message[CurRow+1], "%s", strcat(tmpLine, Message[CurRow+1]));
+	}
+    }
 
-	return WCol;
+    return WCol;
 }
 
+
+
 int Fs_Edit()
 {
-	unsigned char	ch;
-	int		i, Changed = FALSE;
-	char		*filname, *tmpname;
-	FILE		*fd;
+    unsigned char   ch;
+    int		    i, Changed = FALSE;
+    char	    *filname, *tmpname;
+    FILE	    *fd;
 
-	Syslog('b', "FSEDIT: Entering FullScreen editor");
-	clear();
-	fflush(stdout);
-	if ((ttyfd = open("/dev/tty", O_RDWR|O_NONBLOCK)) < 0) {
-		WriteError("$Can't open tty");
-		return FALSE;
-	}
-	Setraw();
-	InsMode = TRUE;
-	TopVisible = 1;
-	Col = 1;
-	Row = 1;
-	Refresh();
-	Debug();
+    Syslog('b', "FSEDIT: Entering FullScreen editor");
+    clear();
+    fflush(stdout);
+    if ((ttyfd = open("/dev/tty", O_RDWR|O_NONBLOCK)) < 0) {
+	WriteError("$Can't open tty");
+	return FALSE;
+    }
+    Setraw();
+    InsMode = TRUE;
+    TopVisible = 1;
+    Col = 1;
+    Row = 1;
+    Refresh();
 
-	while (TRUE) {
-		Nopper();
-		alarm_on();
-		ch = Readkey();
-		CurRow = Row + TopVisible - 1;
+    while (TRUE) {
+	Nopper();
+	alarm_on();
+	ch = Readkey();
+	CurRow = Row + TopVisible - 1;
 
-		switch (ch) {
-		case KEY_ENTER:
-			Syslog('b', "FSEDIT: Enter pressed");
-			Debug();
-			if (Col == 1) {
+	switch (ch) {
+	    case KEY_ENTER:
+			    if (Col == 1) {
 				/* Enter at beginning of line */
 				for (i = Line; i >= CurRow; i--) {
-					sprintf(Message[i+1], "%s", Message[i]);
+				    sprintf(Message[i+1], "%s", Message[i]);
 				}
 				Message[i+1][0] = '\0';
-			} else {
+			    } else {
 				for (i = Line; i > CurRow; i--) {
-					sprintf(Message[i+1], "%s", Message[i]);
+				    sprintf(Message[i+1], "%s", Message[i]);
 				}
 				Message[CurRow+1][0] = '\0';
 				if (Col <= strlen(Message[CurRow])) {
-					/* Enter in middle of line */
-					for (i = Col-1; i <= strlen(Message[CurRow]); i++) {
-						sprintf(Message[CurRow+1], "%s%c", Message[CurRow+1], Message[CurRow][i]);
-					}
-					Message[CurRow][Col-1] = '\0';
+				    /* Enter in middle of line */
+				    for (i = Col-1; i <= strlen(Message[CurRow]); i++) {
+					sprintf(Message[CurRow+1], "%s%c", Message[CurRow+1], Message[CurRow][i]);
+				    }
+				    Message[CurRow][Col-1] = '\0';
 				}
 				/* else Enter at end of line */
-			}
-			Line++;
-			Row++;
-			Col = 1;
-			if (Row >= (exitinfo.iScreenLen -1)) ScrollDown();
-			Refresh();
-			/* Debug(); */
-			Changed = TRUE;
-			break;
+			    }
+			    Line++;
+			    Row++;
+			    Col = 1;
+			    if (Row >= (exitinfo.iScreenLen -1)) 
+				ScrollDown();
+			    Refresh();
+			    Changed = TRUE;
+			    break;
 
-		case ('N' - 64):  /* Insert line, scroll down */
-			Syslog('b', "FSEDIT: Insert line");
-			Debug();
-			for (i = Line; i >= CurRow; i--)
+	    case ('N' - 64):  /* Insert line, scroll down */
+			    for (i = Line; i >= CurRow; i--)
 				sprintf(Message[i+1], "%s", Message[i]);
-			Message[CurRow][0] = '\0';
-			Line++;
-			Col = 1;
-			Refresh();
-			/* Debug(); */
-			Changed = TRUE;
-			break;
+			    Message[CurRow][0] = '\0';
+			    Line++;
+			    Col = 1;
+			    Refresh();
+			    Changed = TRUE;
+			    break;
 
-		case ('Y' - 64):  /* Erase line, scroll up */
-			Syslog('b', "FSEDIT: Erase line");
-			Debug();
-			if (Line == CurRow) {
+	    case ('Y' - 64):  /* Erase line, scroll up */
+			    if (Line == CurRow) {
 				/* Erasing last line */
 				if ((Line > 1) || (strlen(Message[CurRow]) > 0)) {
-					Message[CurRow][0] = '\0';
-					if (Line > 1) {
-						Line--;
-						if (Row == 1) ScrollUp();
-						Row--;
-					}
-					if (Col > strlen(Message[CurRow]))
-						Col = strlen(Message[CurRow]);
-					Refresh();
-					/* Debug(); */
-					Changed = TRUE;
+				    Message[CurRow][0] = '\0';
+				    if (Line > 1) {
+					Line--;
+					if (Row == 1) 
+					    ScrollUp();
+					Row--;
+				    }
+				    if (Col > strlen(Message[CurRow]))
+					Col = strlen(Message[CurRow]);
+				    Refresh();
+				    Changed = TRUE;
 				} else
-					Beep();
-			} else {
+				    Beep();
+			    } else {
 				/* Erasing line in the middle */
 				for (i = CurRow; i < Line; i++) {
-					sprintf(Message[i], "%s", Message[i+1]);
+				    sprintf(Message[i], "%s", Message[i+1]);
 				}
 				Message[i+1][0] = '\0';
 				Line--;
 				if (Col > strlen(Message[CurRow]) + 1)
-					Col = strlen(Message[CurRow]) + 1;
+				    Col = strlen(Message[CurRow]) + 1;
 				Refresh();
-				/* Debug(); */
 				Changed = TRUE;
-			}
-			break;
+			    }
+			    break;
 
-		case KEY_UP:
-		case ('E' - 64):
-			FsMove(KEY_UP);
-			break;
+	    case KEY_UP:
+	    case ('E' - 64):
+			    FsMove(KEY_UP);
+			    break;
 
-		case KEY_DOWN:
-		case ('X' - 64):
-			FsMove(KEY_DOWN);
-			break;
+	    case KEY_DOWN:
+	    case ('X' - 64):
+			    FsMove(KEY_DOWN);
+			    break;
 
-		case KEY_LEFT:
-		case ('S' - 64):
-			FsMove(KEY_LEFT);
-			break;
+	    case KEY_LEFT:
+	    case ('S' - 64):
+			    FsMove(KEY_LEFT);
+			    break;
 
-		case KEY_RIGHT:
-		case ('D' - 64):
-			FsMove(KEY_RIGHT);
-			break;
+	    case KEY_RIGHT:
+	    case ('D' - 64):
+			    FsMove(KEY_RIGHT);
+			    break;
 
-		case KEY_DEL:
-			Syslog('b', "FSEDIT: DEL key");
-			Debug();
-			if (Col <= strlen(Message[CurRow])) {
+	    case KEY_DEL:
+			    if (Col <= strlen(Message[CurRow])) {
 				/*
 				 * If before the end of the line...
 				 */
 				Setcursor();
 				for (i = Col; i <= strlen(Message[CurRow]); i++) {
-					Message[CurRow][i-1] = Message[CurRow][i];
-					printf("%c", Message[CurRow][i]);
+				    Message[CurRow][i-1] = Message[CurRow][i];
+				    printf("%c", Message[CurRow][i]);
 				}
 				printf(" \b");
 				Message[CurRow][i-1] = '\0';
 				Setcursor();
-			} else if (((strlen(Message[CurRow]) + strlen(Message[CurRow+1]) < 75) 
-				    || (strlen(Message[CurRow]) == 0))
-				    && (CurRow < Line)) {
+			    } else if (((strlen(Message[CurRow]) + strlen(Message[CurRow+1]) < 75) 
+				    || (strlen(Message[CurRow]) == 0)) && (CurRow < Line)) {
 				for (i = 0; i < strlen(Message[CurRow+1]); i++)
-					sprintf(Message[CurRow], "%s%c", Message[CurRow], Message[CurRow+1][i]);
+				    sprintf(Message[CurRow], "%s%c", Message[CurRow], Message[CurRow+1][i]);
 				for (i = CurRow+1; i < Line; i++)
-					sprintf(Message[i], "%s", Message[i+1]);
+				    sprintf(Message[i], "%s", Message[i+1]);
 				Message[Line][0] = '\0';
 				Line--;
 				Refresh();
-			} else
+			    } else
                                 Beep();
 
-			/* 
-			 * Trap the extra code so it isn't
-			 * inserted in the text
-			 */
-			if (ch == KEY_DEL) Readkey();
-			break;
+			    /* 
+			     * Trap the extra code so it isn't
+			     * inserted in the text
+			     */
+			    if (ch == KEY_DEL) 
+				Readkey();
+			    break;
 
-		case KEY_BACKSPACE:
-		case KEY_RUBOUT:
-			Syslog('b', "FSEDIT: BS (Backspace)");
-			Debug();
-			if (Col == 1 && CurRow == 1) {
+	    case KEY_BACKSPACE:
+	    case KEY_RUBOUT:
+			    if (Col == 1 && CurRow == 1) {
 				/* BS on first character in message */
 				Beep();
-			} else if (Col == 1) {
+			    } else if (Col == 1) {
 				/* BS at beginning of line */
-				if ((strlen(Message[CurRow-1]) + strlen(Message[CurRow]) < 75)
-					|| strlen(Message[CurRow]) == 0) {
-					Col = strlen(Message[CurRow-1]) + 1;
-					strcat(Message[CurRow-1], Message[CurRow]);
-					for ( i = CurRow; i < Line; i++)
-						sprintf(Message[i], "%s", Message[i+1]);
-					Message[i+1][0] = '\0';
-					Line--;
-					if (Row == 1) ScrollUp();
-					Row--;
-					Refresh();
-					/* Debug(); */
-					Changed = TRUE;
+				if ((strlen(Message[CurRow-1]) + strlen(Message[CurRow]) < 75) || strlen(Message[CurRow]) == 0) {
+				    Col = strlen(Message[CurRow-1]) + 1;
+				    strcat(Message[CurRow-1], Message[CurRow]);
+				    for ( i = CurRow; i < Line; i++)
+					sprintf(Message[i], "%s", Message[i+1]);
+				    Message[i+1][0] = '\0';
+				    Line--;
+				    if (Row == 1) 
+					ScrollUp();
+				    Row--;
+				    Refresh();
+				    Changed = TRUE;
 				} else {
-					i = strlen(Message[CurRow-1]) + strlen(Message[CurRow]);
-/* 					Syslog('b', "FSEDIT: BS lines are too big! %d + %d = %d", */
-/* 					       strlen(Message[CurRow]), */
-/* 					       strlen(Message[CurRow-1]), */
-/* 					       i); */
-					Beep();
+				    i = strlen(Message[CurRow-1]) + strlen(Message[CurRow]);
+				    Beep();
 				}
-			} else {
+			    } else {
 				if (Col == strlen(Message[CurRow]) + 1) {
-					/* BS at end of line */
-					printf("\b \b");
-					fflush(stdout);
-					Col--;
-					Message[CurRow][Col-1] = '\0';
-					Changed = TRUE;
+				    /* BS at end of line */
+				    printf("\b \b");
+				    fflush(stdout);
+				    Col--;
+				    Message[CurRow][Col-1] = '\0';
+				    Changed = TRUE;
 				} else {
-					/* BS in middle of line */
-					Col--;
-					Setcursor();
-					for (i = Col; i <= strlen(Message[CurRow]); i++) {
-						Message[CurRow][i-1] = Message[CurRow][i];
-						printf("%c", Message[CurRow][i]);
-					}
-					printf(" \b");
-					Message[CurRow][strlen(Message[CurRow])] = '\0';
-					Setcursor();
-					Changed = TRUE;
+				    /* BS in middle of line */
+				    Col--;
+				    Setcursor();
+				    for (i = Col; i <= strlen(Message[CurRow]); i++) {
+					Message[CurRow][i-1] = Message[CurRow][i];
+					printf("%c", Message[CurRow][i]);
+				    }
+				    printf(" \b");
+				    Message[CurRow][strlen(Message[CurRow])] = '\0';
+				    Setcursor();
+				    Changed = TRUE;
 				}
-			}
-			break;
+			    }
+			    break;
 
-		case KEY_INS:  /* Toggle Insert Mode */
-		case ('V' - 64):
-			InsMode = !InsMode;
-			Show_Ins();
-			colour(CFG.TextColourF, CFG.TextColourB);
-			Setcursor();
-			Syslog('b', "FSEDIT: InsertMode now %s", InsMode ? "True" : "False");
-			/* 
-			 * Trap the extra code so it isn't
-			 * inserted in the text
-			 */
-			if (ch == KEY_INS) Readkey();
-			break;
+	    case KEY_INS:  /* Toggle Insert Mode */
+	    case ('V' - 64):
+			    InsMode = !InsMode;
+			    Show_Ins();
+			    colour(CFG.TextColourF, CFG.TextColourB);
+			    Setcursor();
+			    /* 
+			     * Trap the extra code so it isn't
+			     * inserted in the text
+			     */
+			    if (ch == KEY_INS) 
+				Readkey();
+			    break;
 
-		case ('L' - 64):  /* Refresh screen */
-			Syslog('b', "FSEDIT: Refresh()");
-			Refresh();
-			break;
+	    case ('L' - 64):  /* Refresh screen */
+			    Refresh();
+			    break;
 
-		case ('R' - 64):  /* Read from file */
-			Syslog('b', "FSEDIT: Read from file");
+	    case ('R' - 64):  /* Read from file */
+			    Syslog('b', "FSEDIT: Read from file");
 
-			tmpname = calloc(PATH_MAX, sizeof(char));
-			filname = calloc(PATH_MAX, sizeof(char));
+			    tmpname = calloc(PATH_MAX, sizeof(char));
+			    filname = calloc(PATH_MAX, sizeof(char));
 
-			colour(14, 0);
-			/* Please enter filename: */
-			printf("\n%s", (char *) Language(245));
-			colour(CFG.InputColourF, CFG.InputColourB);
-			GetstrLC(filname, 80);
+			    colour(14, 0);
+			    /* Please enter filename: */
+			    printf("\n%s", (char *) Language(245));
+			    colour(CFG.InputColourF, CFG.InputColourB);
+			    GetstrLC(filname, 80);
 
-			if ((strcmp(filname, "") == 0)) {
+			    if ((strcmp(filname, "") == 0)) {
 				colour(CFG.HiliteF, CFG.HiliteB);
 				/* No filename entered, aborting */
 				printf("\n\n%s\n", (char *) Language(246));
@@ -661,11 +636,10 @@ int Fs_Edit()
 				free(filname);
 				free(tmpname);
 				Refresh();
-				/* Debug(); */
 				break;
-			}
+			    }
 
-			if (*(filname) == '/' || *(filname) == ' ') {
+			    if (*(filname) == '/' || *(filname) == ' ') {
 				colour(CFG.HiliteF, CFG.HiliteB);
 				/* Illegal filename */
 				printf("\n\n%s\n", (char *) Language(247));
@@ -673,155 +647,147 @@ int Fs_Edit()
 				free(tmpname);
 				free(filname);
 				Refresh();
-				/* Debug(); */
 				break;
-			}
+			    }
 
-			sprintf(tmpname, "%s/%s/wrk/%s", CFG.bbs_usersdir, exitinfo.Name, filname);
-			if ((fd = fopen(tmpname, "r")) == NULL) {
+			    sprintf(tmpname, "%s/%s/wrk/%s", CFG.bbs_usersdir, exitinfo.Name, filname);
+			    if ((fd = fopen(tmpname, "r")) == NULL) {
 				WriteError("$Can't open %s", tmpname);
 				colour(CFG.HiliteF, CFG.HiliteB);
 				/* File does not exist, please try again */
 				printf("\n\n%s\n", (char *) Language(296));
 				Pause();
-			} else {
+			    } else {
 				while ((fgets(filname, 80, fd)) != NULL) {
-					for (i = 0; i < strlen(filname); i++) {
-						if (*(filname + i) == '\0')
-							break;
-						if (*(filname + i) == '\n')
-							*(filname + i) = '\0';
-						if (*(filname + i) == '\r')
-							*(filname + i) = '\0';
-					}
-					/*
-					 * Make sure that any tear or origin lines are
-					 * made invalid.
-					 */
-					if (strncmp(filname, (char *)"--- ", 4) == 0)
-						filname[1] = 'v';
-					if (strncmp(filname, (char *)" * Origin:", 10) == 0)
-						filname[1] = '+';
-					sprintf(Message[Line], "%s", filname);
-					Line++;
+				    for (i = 0; i < strlen(filname); i++) {
+					if (*(filname + i) == '\0')
+					    break;
+					if (*(filname + i) == '\n')
+					    *(filname + i) = '\0';
+					if (*(filname + i) == '\r')
+					    *(filname + i) = '\0';
+				    }
+				    /*
+				     * Make sure that any tear or origin lines are
+				     * made invalid.
+				     */
+				    if (strncmp(filname, (char *)"--- ", 4) == 0)
+					filname[1] = 'v';
+				    if (strncmp(filname, (char *)" * Origin:", 10) == 0)
+					filname[1] = '+';
+				    sprintf(Message[Line], "%s", filname);
+				    Line++;
+				    if ((Line - 1) == TEXTBUFSIZE)
+					break;
 				}
 				fclose(fd);
 				Changed = TRUE;
 				Syslog('+', "FSEDIT: Inserted file %s", tmpname);
-			}
+			    }
 
-			free(tmpname);
-			free(filname);
-			Col = 1;
-			Refresh();
-			/* Debug(); */
-			break;
+			    free(tmpname);
+			    free(filname);
+			    Col = 1;
+			    Refresh();
+			    break;
 
-		case KEY_ESCAPE:  /* Editor menu */
-			Syslog('b', "FSEDIT: Escape pressed");
-			Top_Menu();
+	    case KEY_ESCAPE:  /* Editor menu */
+			    Top_Menu();
 
-			ch = toupper(Readkey());
-			if (ch == 'A' || ch == 'S') {
+			    ch = toupper(Readkey());
+			    if (ch == 'A' || ch == 'S') {
 				Syslog('b', "FSEDIT: %s message (%c)", (ch == 'S' && Changed) ? "Saving" : "Aborting", ch);
 				Unsetraw();
 				close(ttyfd);
-				Debug();
 				clear();
 				fflush(stdout);
-				/* for (i = 1; i <= Line; i++) */
-				/* 	Syslog('b', "%3d \"%s\"", i, Message[i]); */
 				if (ch == 'S' && Changed) {
-					Syslog('+', "FSEDIT: Message saved");
-					return TRUE;
+				    Syslog('+', "FSEDIT: Message saved");
+				    return TRUE;
 				} else {
-					Syslog('+', "FSEDIT: Message aborted");
-					return FALSE;
+				    Syslog('+', "FSEDIT: Message aborted");
+				    return FALSE;
 				}
-			}
+			    }
 
-			if (ch == 'H') {
-				Syslog('b', "FSEDIT: User wants help");
+			    if (ch == 'H') {
 				Full_Help();
 				ch = Readkey();
 				Refresh();
-			} else
+			    } else
 				Top_Help();
 
-			colour(CFG.TextColourF, CFG.TextColourB);
-			Setcursor();
-			break;
+			    colour(CFG.TextColourF, CFG.TextColourB);
+			    Setcursor();
+			    break;
 			
-		default:
-			if (ch > 31 && ch < 127) {
+	    default:
+			    if (ch > 31 && ch < 127) {
 				/*
 				 *  Normal printable characters
 				 */
 				if (Col == strlen(Message[CurRow]) + 1) {
-					/* Syslog('b', "FSEDIT: Append character to end"); */
-					/*
-					 *  Append to line
-					 */
-					sprintf(Message[CurRow], "%s%c", Message[CurRow], ch);
-					if (strlen(Message[CurRow]) > 79){
-						Col = FsWordWrap();
+				    /*
+				     *  Append to line
+				     */
+				    sprintf(Message[CurRow], "%s%c", Message[CurRow], ch);
+				    if (strlen(Message[CurRow]) > 79){
+					Col = FsWordWrap();
+					Row++;
+					Refresh();
+				    } else {
+					Col++;
+					printf("%c", ch);
+					fflush(stdout);
+				    }
+				    Changed = TRUE;
+				} else {
+				    /*
+				     *  Insert or overwrite
+				     */
+				    if (InsMode) {
+					for (i = strlen(Message[CurRow]); i >= (Col-1); i--) {
+					    /*
+					     * Shift characters right
+					     */
+					    Message[CurRow][i+1] = Message[CurRow][i];
+					}
+					Message[CurRow][Col-1] = ch;
+					Col++;
+					if (strlen(Message[CurRow]) > 80) {
+					    i = FsWordWrap();
+					    if (Col > strlen(Message[CurRow])+1) {
+						Col = Col - strlen(Message[CurRow]);
+						if (Col > 1) 
+						    Col--;
 						Row++;
+					    }
+					    if (Row > (exitinfo.iScreenLen -1))
+						ScrollDown();
+					    else
 						Refresh();
 					} else {
-						Col++;
-						printf("%c", ch);
-						fflush(stdout);
+					    locate(Row + 1, 1);
+					    printf(Message[CurRow]);
+					    Setcursor();
 					}
 					Changed = TRUE;
-				} else {
-					/*
-					 *  Insert or overwrite
-					 */
-					/* Syslog('b', "FSEDIT: %s in line",  */
-					/*        InsMode ? "Insert" : "Overwrite"); */
-					if (InsMode) {
-						for (i = strlen(Message[CurRow]); i >= (Col-1); i--) {
-							/*
-							 * Shift characters right
-							 */
-							Message[CurRow][i+1] = Message[CurRow][i];
-						}
-						Message[CurRow][Col-1] = ch;
-						Col++;
-						if (strlen(Message[CurRow]) > 80) {
-							i = FsWordWrap();
-							if (Col > strlen(Message[CurRow])+1) {
-								Col = Col - strlen(Message[CurRow]);
-								if (Col > 1) Col--;
-								Row++;
-							}
-							if (Row > (exitinfo.iScreenLen -1))
-								ScrollDown();
-							else
-								Refresh();
-						} else {
-							locate(Row + 1, 1);
-							printf(Message[CurRow]);
-							Setcursor();
-						}
-						Changed = TRUE;
-					} else {
-						Message[CurRow][Col-1] = ch;
-						printf("%c", ch);
-						fflush(stdout);
-						Col++;
-						Changed = TRUE;
-					}
+				    } else {
+					Message[CurRow][Col-1] = ch;
+					printf("%c", ch);
+					fflush(stdout);
+					Col++;
+					Changed = TRUE;
+				    }
 				}
-			} else
-				Syslog('b', "FSEDIT: Pressed %d (unsupported)", ch);
-		}
+			    } 
 	}
+    }
 
-	WriteError("FsEdit(): Impossible to be here");
-	Unsetraw();
-	close(ttyfd);
-	return FALSE;
+    WriteError("FsEdit(): Impossible to be here");
+    Unsetraw();
+    close(ttyfd);
+    return FALSE;
 }
 
 
diff --git a/mbsebbs/fsedit.h b/mbsebbs/fsedit.h
index 51fc1560..9600e3ab 100644
--- a/mbsebbs/fsedit.h
+++ b/mbsebbs/fsedit.h
@@ -26,7 +26,6 @@ void Full_Help(void);
 void Setcursor(void);
 void Beep(void);
 void Refresh(void);
-void Debug(void);
 void GetstrLC(char *, int);
 void ScrollUp(void);
 void ScrollDown(void);
diff --git a/mbsebbs/mail.h b/mbsebbs/mail.h
index 692280db..3c56ac35 100644
--- a/mbsebbs/mail.h
+++ b/mbsebbs/mail.h
@@ -3,7 +3,7 @@
 #ifndef _MAIL_H
 #define _MAIL_H
 
-#define	TEXTBUFSIZE	500
+#define	TEXTBUFSIZE	700
 
 
 int  LC(int);				/* More prompt for reading messages */