Index: util.c
===================================================================
--- util.c	(revision 2)
+++ util.c	(working copy)
@@ -350,10 +350,6 @@
 		Writechar(usr, '>');
 		return 3;
 	}
-	if (!cstrnicmp(code, "<cr>", 4)) {
-		Writechar(usr, '\r');
-		return 3;
-	}
 
 /*
 	there are two special codes for use in help files and stuff...
@@ -459,9 +455,6 @@
 	if (!cstrnicmp(code, "<gt>", 4))
 		return 4;
 
-	if (!cstrnicmp(code, "<cr>", 4))
-		return 4;
-
 	return 1;
 }
 
Index: ccat.c
===================================================================
--- ccat.c	(revision 2)
+++ ccat.c	(working copy)
@@ -246,10 +246,6 @@
 		Writechar('>');
 		return 3;
 	}
-	if (!cstrnicmp(code, "<cr>", 4)) {
-		Writechar('\r');
-		return 3;
-	}
 
 /*
 	there are two special codes for use in help files and stuff...
@@ -355,9 +351,6 @@
 	if (!cstrnicmp(code, "<gt>", 4))
 		return 4;
 
-	if (!cstrnicmp(code, "<cr>", 4))
-		return 4;
-
 	return 1;
 }
 
Index: state_msg.c
===================================================================
--- state_msg.c	(revision 2)
+++ state_msg.c	(working copy)
@@ -1685,7 +1685,7 @@
 
 	Enter(state_more_prompt);
 
-	Put(usr, "<cr>                                      <cr><green>");
+	Print(usr, "%c                                      %c<green>", KEY_CTRL('X'), KEY_CTRL('X'));
 	switch(c) {
 		case INIT_STATE:
 			if (usr->more_text == NULL) {
@@ -1872,7 +1872,7 @@
 		Return;
 	}
 	if (r == EDIT_RETURN) {
-		Put(usr, "<cr>                             <cr>");
+		Print(usr, "%c                             %c", KEY_CTRL('X'), KEY_CTRL('X'));
 		if (!usr->edit_buf[0]) {
 			l = 0;
 			for(sl = usr->textp; sl != NULL && sl->prev != NULL && l < usr->term_height; sl = sl->prev)
@@ -1928,7 +1928,7 @@
 		Return;
 	}
 	if (r == EDIT_RETURN) {
-		Put(usr, "<cr>                             <cr>");
+		Print(usr, "%c                             %c", KEY_CTRL('X'), KEY_CTRL('X'));
 		if (!usr->edit_buf[0]) {
 			l = 0;
 			for(sl = usr->textp; sl != NULL && sl->prev != NULL && l < usr->term_height; sl = sl->prev)
@@ -2155,7 +2155,7 @@
 		usr->runtime_flags |= RTF_BUSY;
 		Put(usr, "<red>-- Press any key to continue --");
 	} else {
-		Put(usr, "<cr>                               <cr>");
+		Print(usr, "%c                               %c", KEY_CTRL('X'), KEY_CTRL('X'));
 		RET(usr);
 	}
 	Return;
Index: state_sysop.c
===================================================================
--- state_sysop.c	(revision 2)
+++ state_sysop.c	(working copy)
@@ -1336,7 +1336,7 @@
 		Put(usr, "\n"
 			"<white>[Press a key]");
 	} else {
-		Put(usr, "<cr>              <cr>");
+		Print(usr, "%c              %c", KEY_CTRL('X'), KEY_CTRL('X'));
 		RET(usr);
 	}
 	Return;
Index: edit.c
===================================================================
--- edit.c	(revision 2)
+++ edit.c	(working copy)
@@ -793,16 +793,16 @@
 	}
 	if (usr->total_lines >= PARAM_MAX_XMSG_LINES) {
 		if (c == KEY_CTRL('C')) {
-			Put(usr, "<cr>                                                          <cr>");
+			Print(usr, "%c                                                          %c", KEY_CTRL('X'), KEY_CTRL('X'));
 			usr->more_text = rewind_StringList(usr->more_text);
 			return EDIT_BREAK;
 		}
 		if (c == KEY_CTRL('X')) {
-			Put(usr, "<cr>                                                          <cr>");
+			Print(usr, "%c                                                          %c", KEY_CTRL('X'), KEY_CTRL('X'));
 			usr->more_text = rewind_StringList(usr->more_text);
 			return EDIT_RETURN;
 		}
-		Put(usr, "<cr><red>Too many lines, press <white><<yellow>Ctrl-C<white>><red> to abort, <white><<yellow>Ctrl-X<white>><red> to send");
+		Print(usr, "%c<red>Too many lines, press <white><<yellow>Ctrl-C<white>><red> to abort, <white><<yellow>Ctrl-X<white>><red> to send", KEY_CTRL('X'));
 		return 0;
 	}
 	if (usr->runtime_flags & RTF_COLOR_EDITING) {
@@ -954,10 +954,10 @@
 	}
 	if (usr->total_lines >= PARAM_MAX_MSG_LINES) {
 		if (c == KEY_CTRL('C')) {
-			Put(usr, "<cr>                                 \n");
+			Print(usr, "%c                                 \n", KEY_CTRL('X'));
 			return EDIT_BREAK;
 		}
-		Put(usr, "<cr><red>Too many lines, press <white><<yellow>Ctrl-C<white>>");
+		Print(usr, "%c<red>Too many lines, press <white><<yellow>Ctrl-C<white>>", KEY_CTRL('X'));
 		return 0;
 	}
 	if (usr->runtime_flags & RTF_COLOR_EDITING) {