Index: state_room.c
===================================================================
--- state_room.c	(revision 3)
+++ state_room.c	(working copy)
@@ -261,9 +261,9 @@
 				else
 					num_buf[0] = 0;
 
-				Print(usr, "<white>eXpress Message%s\n", num_buf);
+				Print(usr, "<white>Express Message%s\n", num_buf);
 				if (is_guest(usr->name)) {
-					Print(usr, "<red>Sorry, but the <yellow>%s<red> user cannot send eXpress Messages\n", PARAM_NAME_GUEST);
+					Print(usr, "<red>Sorry, but the <yellow>%s<red> user cannot send Express Messages\n", PARAM_NAME_GUEST);
 					break;
 				}
 				if (usr->runtime_flags & RTF_HOLD) {
@@ -275,7 +275,7 @@
 				Return;
 			} else
 				if (PARAM_HAVE_DISABLED_MSG)
-					Put(usr, "<red>Sorry, but <yellow>eXpress Messages<red> are not enabled on this server\n");
+					Put(usr, "<red>Sorry, but <yellow>Express Messages<red> are not enabled on this server\n");
 			break;
 
 		case '0':
@@ -298,7 +298,7 @@
 				Print(usr, "<white>Quick X%s\n", num_buf);
 
 				if (is_guest(usr->name)) {
-					Print(usr, "<red>Sorry, but the <yellow>%s<red> user cannot send Quick eXpress Messages\n", PARAM_NAME_GUEST);
+					Print(usr, "<red>Sorry, but the <yellow>%s<red> user cannot send Quick Express Messages\n", PARAM_NAME_GUEST);
 					break;
 				}
 				if (usr->runtime_flags & RTF_HOLD) {
@@ -532,7 +532,7 @@
 				Return;
 			} else
 				if (PARAM_HAVE_DISABLED_MSG)
-					Put(usr, "<red>Sorry, but <yellow>eXpress Messages<red> are not enabled on this server\n");
+					Put(usr, "<red>Sorry, but <yellow>Express Messages<red> are not enabled on this server\n");
 			break;
 
 		case KEY_CTRL('B'):
@@ -2048,7 +2048,7 @@
 }
 
 /*
-	you're in a chatroom, but someone is sending you eXpress Messages
+	you're in a chatroom, but someone is sending you Express Messages
 	btw, if RTF_BUSY is set, then it is handled by recvMsg()
 */
 void chatroom_recvMsg(User *usr, BufferedMsg *msg) {
Index: state_msg.c
===================================================================
--- state_msg.c	(revision 3)
+++ state_msg.c	(working copy)
@@ -861,7 +861,7 @@
 		(void)sort_StringList(&usr->override, alphasort_StringList);
 	}
 	if ((msg->flags & BUFMSG_TYPE) == BUFMSG_XMSG) {
-		cstrcpy(msg_type, (!PARAM_HAVE_XMSG_HDR || msg->xmsg_header == NULL || !msg->xmsg_header[0]) ? "eXpress message" : msg->xmsg_header, MAX_LINE);
+		cstrcpy(msg_type, (!PARAM_HAVE_XMSG_HDR || msg->xmsg_header == NULL || !msg->xmsg_header[0]) ? "Express message" : msg->xmsg_header, MAX_LINE);
 
 		if (from != usr) {
 			usr->xrecv++;							/* update stats */
@@ -1051,7 +1051,7 @@
 }
 
 /*
-	Produce an eXpress message header
+	Produce an Express message header
 	Note: buf must be large enough (PRINT_BUF in size)
 */
 char *buffered_msg_header(User *usr, BufferedMsg *msg, char *buf, int buflen) {
@@ -1154,7 +1154,7 @@
 /* the message type */
 
 	if ((msg->flags & BUFMSG_TYPE) == BUFMSG_XMSG)
-		cstrcpy(msgtype, (!PARAM_HAVE_XMSG_HDR || msg->xmsg_header == NULL || !msg->xmsg_header[0]) ? "eXpress message" : msg->xmsg_header, MAX_LINE);
+		cstrcpy(msgtype, (!PARAM_HAVE_XMSG_HDR || msg->xmsg_header == NULL || !msg->xmsg_header[0]) ? "Express message" : msg->xmsg_header, MAX_LINE);
 	else
 		if ((msg->flags & BUFMSG_TYPE) == BUFMSG_EMOTE)
 			cstrcpy(msgtype, "Emote", MAX_LINE);
Index: state_help.c
===================================================================
--- state_help.c	(revision 3)
+++ state_help.c	(working copy)
@@ -101,7 +101,7 @@
 
 		case 'x':
 		case 'X':
-			Put(usr, "eXpress Messages\n");
+			Put(usr, "Express Messages\n");
 			HELP_TEXT("xmsg");
 
 		case 'f':
Index: Stats.c
===================================================================
--- Stats.c	(revision 3)
+++ Stats.c	(working copy)
@@ -514,10 +514,10 @@
 	Print(usr, "\n<green>Most logins are by                     <white>%-*s<green> : <yellow>%s\n", w, stats.most_logins, print_number(stats.logins, date_buf, sizeof(date_buf)));
 	if (PARAM_HAVE_XMSGS) {
 		if (stats.xsent > 0 && stats.most_xsent[0])
-			Print(usr, "<green>Most eXpress Messages were sent by     <white>%-*s<green> : <yellow>%s\n", w, stats.most_xsent, print_number(stats.xsent, date_buf, sizeof(date_buf)));
+			Print(usr, "<green>Most Express Messages were sent by     <white>%-*s<green> : <yellow>%s\n", w, stats.most_xsent, print_number(stats.xsent, date_buf, sizeof(date_buf)));
 
 		if (stats.xrecv > 0 && stats.most_xrecv[0])
-			Print(usr, "<green>Most eXpress Messages were received by <white>%-*s<green> : <yellow>%s\n", w, stats.most_xrecv, print_number(stats.xrecv, date_buf, sizeof(date_buf)));
+			Print(usr, "<green>Most Express Messages were received by <white>%-*s<green> : <yellow>%s\n", w, stats.most_xrecv, print_number(stats.xrecv, date_buf, sizeof(date_buf)));
 	}
 	if (PARAM_HAVE_EMOTES) {
 		if (stats.esent > 0 && stats.most_esent[0])
@@ -550,7 +550,7 @@
 		Put(usr, "\n<yellow>Since boot time\n");
 
 		if (PARAM_HAVE_XMSGS) {
-			Print(usr, "<green>eXpress Messages sent: <yellow>%-15s", print_number(stats.xsent_boot, date_buf, sizeof(date_buf)));
+			Print(usr, "<green>Express Messages sent: <yellow>%-15s", print_number(stats.xsent_boot, date_buf, sizeof(date_buf)));
 			Print(usr, "<green> received: <yellow>%s\n", print_number(stats.xrecv_boot, date_buf, sizeof(date_buf)));
 		}
 		if (PARAM_HAVE_EMOTES) {
@@ -572,7 +572,7 @@
 		Put(usr, "\n<yellow>Your statistics\n");
 
 		if (PARAM_HAVE_XMSGS) {
-			Print(usr, "<green>eXpress Messages sent: <yellow>%-15s", print_number(usr->xsent, date_buf, sizeof(date_buf)));
+			Print(usr, "<green>Express Messages sent: <yellow>%-15s", print_number(usr->xsent, date_buf, sizeof(date_buf)));
 			Print(usr, "<green> received: <yellow>%s\n", print_number(usr->xrecv, date_buf, sizeof(date_buf)));
 		}
 		if (PARAM_HAVE_EMOTES) {
Index: state_config.c
===================================================================
--- state_config.c	(revision 3)
+++ state_config.c	(working copy)
@@ -79,23 +79,23 @@
 			buffer_text(usr);
 
 			Put(usr, "<magenta>\n"
-				"<hotkey>Address                      <hotkey>Help\n"
-				"Profile <hotkey>info                 <hotkey>Terminal settings\n"
-				"<hotkey>Doing                        Customize <hotkey>Who list\n"
-				"<hotkey>Reminder                     <hotkey>Options\n"
+				" <hotkey>Address                         <hotkey>Help\n"
+				" Profile <hotkey>info                    <hotkey>Terminal settings\n"
+				" <hotkey>Doing                           Customize <hotkey>Who list\n"
+				" <hotkey>Reminder                        <hotkey>Options\n"
 			);
 			if (PARAM_HAVE_XMSG_HDR)
-				Put(usr, "e<hotkey>Xpress Message header       ");
+				Put(usr, " E<hotkey>xpress Message header       ");
 
 			if (PARAM_HAVE_QUICK_X)
-				Put(usr, "<hotkey>Quicklist\n");
+				Put(usr, "   <hotkey>Quicklist\n");
 			else
 				if (PARAM_HAVE_XMSG_HDR)
 					Put(usr, "\n");
 
 			Put(usr,
-				"Anon<hotkey>ymous alias              <hotkey>Friends and <hotkey>Enemies\n"
-				"<hotkey>Password                     Time <hotkey>zone\n"
+	 			" Anon<hotkey>ymous alias                 <hotkey>Friends and <hotkey>Enemies\n"
+				" <hotkey>Password                        Time <hotkey>zone\n"
 			);
 			read_menu(usr);
 			Return;
@@ -151,7 +151,7 @@
 		case 'x':
 		case 'X':
 			if (PARAM_HAVE_XMSG_HDR) {
-				Put(usr, "eXpress Message header\n");
+				Put(usr, "Express Message header\n");
 				CALL(usr, STATE_CONFIG_XMSG_HEADER);
 				Return;
 			}
@@ -277,22 +277,22 @@
 			buffer_text(usr);
 
 			Print(usr, "<magenta>\n"
-				"<hotkey>Real name :%s<magenta>\n", print_address(usr->real_name, "", buf, MAX_LONGLINE));
+				" <hotkey>Real name :%s<magenta>\n", print_address(usr->real_name, "", buf, MAX_LONGLINE));
 
-			Print(usr, "<hotkey>Address   :%s\n", print_address(usr->street, " street", buf, MAX_LONGLINE));
+			Print(usr, " <hotkey>Address   :%s\n", print_address(usr->street, " street", buf, MAX_LONGLINE));
 
 			Print(usr, "           %s",		print_address(usr->city, " city", buf, MAX_LONGLINE));
 			Print(usr, " %s\n",				print_address(usr->zipcode, " ZIP code", buf, MAX_LONGLINE));
 			Print(usr, "           %s,",	print_address(usr->state, " state", buf, MAX_LONGLINE));
 			Print(usr, "%s<magenta>\n",		print_address(usr->country, " country", buf, MAX_LONGLINE));
 
-			Print(usr, "<hotkey>Phone     :%s<magenta>\n",	print_address(usr->phone, " phone number", buf, MAX_LONGLINE));
+			Print(usr, " <hotkey>Phone     :%s<magenta>\n",	print_address(usr->phone, " phone number", buf, MAX_LONGLINE));
 			Print(usr, "\n"
-				"<hotkey>E-mail    :%s<magenta>\n",			print_address(usr->email, " e-mail address", buf, MAX_LONGLINE));
-			Print(usr, "<hotkey>WWW       :%s<magenta>\n",	print_address(usr->www, " WWW address", buf, MAX_LONGLINE));
+				" <hotkey>E-mail    :%s<magenta>\n",			print_address(usr->email, " e-mail address", buf, MAX_LONGLINE));
+			Print(usr, " <hotkey>WWW       :%s<magenta>\n",	print_address(usr->www, " WWW address", buf, MAX_LONGLINE));
 
 			Print(usr, "\n"
-				"<hotkey>Hide address from non-friends     <white>%s<magenta>\n",
+				" <hotkey>Hide address from non-friends     <white>%s<magenta>\n",
 
 				(usr->flags & USR_HIDE_ADDRESS) ? "Yes" : "No"
 			);
@@ -433,17 +433,17 @@
 	switch(c) {
 		case INIT_STATE:
 			Put(usr, "<magenta>\n"
-				"<hotkey>View current                 <hotkey>Upload\n"
-				"<hotkey>Enter new                    <hotkey>Download\n"
+				" <hotkey>View current                    <hotkey>Upload\n"
+				" <hotkey>Enter new                       <hotkey>Download\n"
 			);
 			if (PARAM_HAVE_VANITY) {
 				Put(usr, "\n"
-					"Vanit<hotkey>y"
+					" Vanit<hotkey>y"
 				);
 				if (usr->vanity != NULL && usr->vanity[0])
 					Print(usr, "                       <magenta>*<white> %s <magenta>*\n", usr->vanity);
 				else
-					Put(usr, "                       <white>None\n");
+					Put(usr, "                          <white>None\n");
 			}
 			break;
 
@@ -595,9 +595,9 @@
 	Enter(state_config_xmsg_header);
 
 	if (c == INIT_STATE && usr->xmsg_header != NULL && usr->xmsg_header[0])
-		Print(usr, "<green>Your current eXpress Message header:<cyan> %s\n", usr->xmsg_header);
+		Print(usr, "<green>Your current Express Message header:<cyan> %s\n", usr->xmsg_header);
 
-	change_config(usr, c, &usr->xmsg_header, "<green>Enter new eXpress Message header:<yellow> ");
+	change_config(usr, c, &usr->xmsg_header, "<green>Enter new Express Message header:<yellow> ");
 	Return;
 }
 
@@ -882,8 +882,8 @@
 			buffer_text(usr);
 
 			Print(usr, "<magenta>\n"
-				"<hotkey>Terminal emulation                   <white>%s<magenta>\n"
-				"Make use of bold/bright <hotkey>attribute    <white>%s<magenta>\n",
+				" <hotkey>Terminal emulation                   <white>%s<magenta>\n"
+				" Make use of bold/bright <hotkey>attribute    <white>%s<magenta>\n",
 
 				(usr->flags & USR_ANSI) ? "ANSI" : "dumb",
 				(usr->flags & USR_BOLD) ? "Yes"  : "No"
@@ -896,7 +896,7 @@
 	see also print_hotkey() in util.c
 */
 			Print(usr,
-				"Show hotkeys in <hotkey>bold/bright          <white>%s<magenta>\n",
+				" Show hotkeys in <hotkey>bold/bright          <white>%s<magenta>\n",
 
 				((usr->flags & (USR_BOLD|USR_BOLD_HOTKEYS)) == (USR_BOLD|USR_BOLD_HOTKEYS)
 					|| (usr->flags & (USR_BOLD|USR_BOLD_HOTKEYS)) == 0) ? "No" : "Yes"
@@ -909,8 +909,8 @@
 	see also print_hotkey() in util.c
 */
 			Print(usr,
-				"Always show hotkeys in <hotkey>uppercase     <white>%s<magenta>\n"
-				"Show angle brac<hotkey>kets around hotkeys   <white>%s<magenta>%s\n",
+				" Always show hotkeys in <hotkey>uppercase     <white>%s<magenta>\n"
+				" Show angle brac<hotkey>kets around hotkeys   <white>%s<magenta>%s\n",
 
 				(usr->flags & USR_UPPERCASE_HOTKEYS) ? "Yes" : "No",
 				(((usr->flags & (USR_ANSI|USR_HOTKEY_BRACKETS)) == (USR_ANSI|USR_HOTKEY_BRACKETS))
@@ -918,24 +918,24 @@
 				((usr->flags & (USR_ANSI|USR_HOTKEY_BRACKETS)) == USR_HOTKEY_BRACKETS) ? "  (Hit <key>k to enable)" : ""
 			);
 			Print(usr, "\n"
-				"<hotkey>Force screen width and height        <white>%s<magenta>\n"
-				"Screen <hotkey>dimensions                    <white>%dx%d<magenta>\n",
+				" <hotkey>Force screen width and height        <white>%s<magenta>\n"
+				" Screen <hotkey>dimensions                    <white>%dx%d<magenta>\n",
 
 				(usr->flags & USR_FORCE_TERM) ? "Yes" : "No",
 				usr->display->term_width, usr->display->term_height
 			);
 			if (usr->flags & USR_ANSI) {
 				Print(usr, "\n"
-					"Color <hotkey>scheme                         <white>%s<magenta>\n"
-					"Customize <hotkey>colors\n",
+					" Color <hotkey>scheme                         <white>%s<magenta>\n"
+					" Customize <hotkey>colors\n",
 
 					(usr->flags & USR_DONT_AUTO_COLOR) ? "Classic" : "Modern"
 				);
 				if (!(usr->flags & USR_DONT_AUTO_COLOR))
-					Print(usr, "Customize colors of s<hotkey>ymbols\n");
+					Print(usr, " Customize colors of s<hotkey>ymbols\n");
 			}
 			Print(usr, "\n"
-				"Hackerz m<hotkey>0de                         <white>%s<magenta>\n",
+				" Hackerz m<hotkey>0de                         <white>%s<magenta>\n",
 
 				(usr->flags & USR_HACKERZ) ? "Oh Yeah" : "Off"
 			);
@@ -1645,21 +1645,21 @@
 			buffer_text(usr);
 
 			Print(usr, "\n<magenta>"
-				"Default who list <hotkey>format      <white>%s<magenta>\n"
-				"Sort <hotkey>by...                   <white>%s<magenta>\n"
-				"Sort <hotkey>order                   <white>%s<magenta>\n",
+				" Default who list <hotkey>format      <white>%s<magenta>\n"
+				" Sort <hotkey>by...                   <white>%s<magenta>\n"
+				" Sort <hotkey>order                   <white>%s<magenta>\n",
 				(usr->flags & USR_SHORT_WHO)       ? "Short"      : "Long",
 				(usr->flags & USR_SORT_BYNAME)     ? "Name"       : "Online time",
 				(usr->flags & USR_SORT_DESCENDING) ? "Descending" : "Ascending"
 			);
 			if (PARAM_HAVE_CHATROOMS)
 				Print(usr,
-					"When in a <hotkey>chat room...       <white>%s<magenta>\n",
+					" When in a <hotkey>chat room...       <white>%s<magenta>\n",
 					(usr->flags & USR_SHOW_ALL)        ? "Show All"   : "Show Inside"
 				);
 
 			Print(usr,
-				"Show online <hotkey>enemies          <white>%s<magenta>\n",
+				" Show online <hotkey>enemies          <white>%s<magenta>\n",
 				(usr->flags & USR_SHOW_ENEMIES)    ? "Yes"        : "No"
 			);
 			read_menu(usr);
@@ -1739,10 +1739,10 @@
 			buffer_text(usr);
 
 			Print(usr, "\n<magenta>"
-				"Beep on e<hotkey>Xpress message arrival      <white>%s<magenta>\n"
-				"Messages have <hotkey>sequence numbers       <white>%s<magenta>\n"
-				"<hotkey>Message reception is ...             <white>%s<magenta>\n"
-				"<hotkey>Accept Xes from Friends regardless   <white>%s<magenta>\n",
+				" Beep on e<hotkey>Xpress message arrival      <white>%s<magenta>\n"
+				" Messages have <hotkey>sequence numbers       <white>%s<magenta>\n"
+				" <hotkey>Message reception is ...             <white>%s<magenta>\n"
+				" <hotkey>Accept Xes from Friends regardless   <white>%s<magenta>\n",
 
 				(usr->flags & USR_BEEP) ? "Yes" : "No",
 				(usr->flags & USR_XMSG_NUM) ? "Yes" : "No",
@@ -1750,10 +1750,10 @@
 				(usr->flags & USR_BLOCK_FRIENDS) ? "No" : "Yes"
 			);
 			Print(usr,
-				"M<hotkey>ulti message reception is ...       <white>%s<magenta>\n"
-				"<hotkey>Follow up mode (auto reply)          <white>%s<magenta>\n"
-				"<hotkey>Hold message mode when busy          <white>%s<magenta>\n"
-				"Ask for a <hotkey>reason when going away     <white>%s<magenta>\n",
+				" M<hotkey>ulti message reception is ...       <white>%s<magenta>\n"
+				" <hotkey>Follow up mode (auto reply)          <white>%s<magenta>\n"
+				" <hotkey>Hold message mode when busy          <white>%s<magenta>\n"
+				" Ask for a <hotkey>reason when going away     <white>%s<magenta>\n",
 
 				(usr->flags & USR_DENY_MULTI) ? "Disabled" : "Enabled",
 				(usr->flags & USR_FOLLOWUP) ? "On" : "Off",
@@ -1761,10 +1761,10 @@
 				(usr->flags & USR_DONT_ASK_REASON) ? "No" : "Yes"
 			);
 			Print(usr, "\n"
-				"Rooms <hotkey>beep on new posts              <white>%s<magenta>\n"
-				"<hotkey>Enter message defaults to Upload     <white>%s<magenta>\n"
-				"C<hotkey>ycle rooms on no new messages       <white>%s<magenta>\n"
-				"Show room <hotkey>number in prompt           <white>%s<magenta>\n",
+				" Rooms <hotkey>beep on new posts              <white>%s<magenta>\n"
+				" <hotkey>Enter message defaults to Upload     <white>%s<magenta>\n"
+				" C<hotkey>ycle rooms on no new messages       <white>%s<magenta>\n"
+				" Show room <hotkey>number in prompt           <white>%s<magenta>\n",
 
 				(usr->flags & USR_ROOMBEEP) ? "Yes" : "No",
 				(usr->flags2 & USR2_ENTER_UPLOAD) ? "Yes" : "No",
@@ -1776,21 +1776,21 @@
 				r = Lobby_room;
 			}
 			Print(usr,
-				"Default r<hotkey>oom is set to ...           <yellow>%s<magenta>\n",
+				" Default r<hotkey>oom is set to ...           <yellow>%s<magenta>\n",
 
 				room_name(usr, r, buf, MAX_LINE)
 			);
 			Print(usr, "\n"
-				"<hotkey>Downloads pause every page           <white>%s<magenta>\n"
-				"<hotkey>Color codes in downloads are ...     <white>%s<magenta>\n",
+				" <hotkey>Downloads pause every page           <white>%s<magenta>\n"
+				" <hotkey>Color codes in downloads are ...     <white>%s<magenta>\n",
 
 				(usr->flags & USR_NOPAGE_DOWNLOADS) ? "No" : "Yes",
 				(usr->flags & USR_SHORT_DL_COLORS) ? "Short" : "Long"
 			);
 			Print(usr, "\n"
-				"<hotkey>Verbose friend notifications         <white>%s<magenta>\n"
-				"Default <hotkey>profile info is ...          <white>%s<magenta>\n"
-				"Hide profile <hotkey>info from enemies       <white>%s<magenta>\n",
+				" <hotkey>Verbose friend notifications         <white>%s<magenta>\n"
+				" Default <hotkey>profile info is ...          <white>%s<magenta>\n"
+				" Hide profile <hotkey>info from enemies       <white>%s<magenta>\n",
 
 				(usr->flags & USR_FRIEND_NOTIFY) ? "On" : "Off",
 				(usr->flags & USR_SHORT_PROFILE) ? "Short" : "Long",
@@ -2043,8 +2043,8 @@
 					*p = ' ';
 			}
 			Print(usr, "<magenta>\n"
-				"<hotkey>Display time as          <white>%s<magenta>\n"
-				"<hotkey>Select time zone         <white>%s (%s)<magenta>\n",
+				" <hotkey>Display time as          <white>%s<magenta>\n"
+				" <hotkey>Select time zone         <white>%s (%s)<magenta>\n",
 	
 				(usr->flags & USR_12HRCLOCK) ? "12 hour clock (AM/PM)" : "24 hour clock",
 				buf, name_Timezone(usr->tz)
Index: state_sysop.c
===================================================================
--- state_sysop.c	(revision 3)
+++ state_sysop.c	(working copy)
@@ -4540,7 +4540,7 @@
 				(PARAM_HAVE_FOLLOWUP == PARAM_FALSE) ? "off" : "on"
 			);
 			Print(usr,
-				"X <hotkey>Reply               <white>%-3s<magenta>      eXpres<hotkey>s message header  <white>%s<magenta>\n"
+				"X <hotkey>Reply               <white>%-3s<magenta>      Expres<hotkey>s message header  <white>%s<magenta>\n"
 				"<hotkey>Vanity flag           <white>%-3s<magenta>      Resident <hotkey>info           <white>%s<magenta>\n"
 				"Cate<hotkey>gories            <white>%-3s<magenta>\n"
 				"Ch<hotkey>at rooms            <white>%-3s<magenta>      Guess <hotkey>name rooms        <white>%s<magenta>\n"
@@ -4601,7 +4601,7 @@
 
 		case 'x':
 		case 'X':
-			TOGGLE_FEATURE(PARAM_HAVE_XMSGS, "eXpress Messages");
+			TOGGLE_FEATURE(PARAM_HAVE_XMSGS, "Express Messages");
 
 		case 'e':
 		case 'E':
@@ -4637,7 +4637,7 @@
 
 		case 's':
 		case 'S':
-			TOGGLE_FEATURE(PARAM_HAVE_XMSG_HDR, "eXpress message header");
+			TOGGLE_FEATURE(PARAM_HAVE_XMSG_HDR, "Express message header");
 
 		case 'v':
 		case 'V':
Index: state.c
===================================================================
--- state.c	(revision 3)
+++ state.c	(working copy)
@@ -70,7 +70,7 @@
 #include <ctype.h>
 
 /*
-	run the 'common' functions, these are all functions but no eXpress Messages and
+	run the 'common' functions, these are all functions but no Express Messages and
 	no message reading functions
 
 	Be advised: This function calls other states, and may reset the RTF_BUSY flag
@@ -1061,7 +1061,7 @@
 }
 
 /*
-	Send an eXpress message as Mail> to user 'name'
+	Send an Express message as Mail> to user 'name'
 */
 void mail_msg(User *usr, BufferedMsg *msg, char *name) {
 MailTo *mailto;