Reflect recent changes in handling of the plurals

@@ -28,31 +28,31 @@ mail_test "folders" -re "one.*two"
 mail_test "file +one" \
  "Held 4 messages in $MU_SPOOL_DIR/mbox1" 
 mail_test "sum" \
- "\"$MU_FOLDER_DIR/one\": 1 messages 1 new"
+ "\"$MU_FOLDER_DIR/one\": 1 message 1 new"
 mail_test "headers" \
  ">N   1 Foo Bar            Fri Dec 28 22:18  10/350   Mailbox 1"	
 
 mail_test "file +two" \
- "Held 1 messages in $MU_FOLDER_DIR/one"
+ "Held 1 message in $MU_FOLDER_DIR/one"
 mail_test "sum" \
- "\"$MU_FOLDER_DIR/two\": 1 messages 1 new"
+ "\"$MU_FOLDER_DIR/two\": 1 message 1 new"
 mail_test "headers" \
  ">N   1 Foo Bar            Fri Dec 28 22:18  10/350   Mailbox 2"
 
 mail_test "file #" \
- "Held 1 messages in $MU_FOLDER_DIR/two"
+ "Held 1 message in $MU_FOLDER_DIR/two"
 mail_test "sum" \
- "\"$MU_FOLDER_DIR/one\": 1 messages 1 new"
+ "\"$MU_FOLDER_DIR/one\": 1 message 1 new"
 
 mail_test "file #" \
- "Held 1 messages in $MU_FOLDER_DIR/one"
+ "Held 1 message in $MU_FOLDER_DIR/one"
 mail_test "sum" \
- "\"$MU_FOLDER_DIR/two\": 1 messages 1 new"
+ "\"$MU_FOLDER_DIR/two\": 1 message 1 new"
 
 mail_test "file &" \
- "Held 1 messages in $MU_FOLDER_DIR/two"
+ "Held 1 message in $MU_FOLDER_DIR/two"
 mail_test "sum" \
- "\"$MU_SPOOL_DIR/mbox\": 1 messages 1 new"
+ "\"$MU_SPOOL_DIR/mbox\": 1 message 1 new"
 mail_test "headers" \
  ">N   1 Sergey Poznyakoff  Sun Jul 16 12:11  12/425   MBOX"	
 

@@ -37,8 +37,8 @@ mail_test "h" \
 
 # ... and quit
 mail_test -noprompt "quit" \
-	"Saved 1 messages in $MU_SPOOL_DIR/mbox" \
-	"Held 1 messages in $MU_SPOOL_DIR/mbox1"
+	"Saved 1 message in $MU_SPOOL_DIR/mbox" \
+	"Held 1 message in $MU_SPOOL_DIR/mbox1"
 
 # Now check the mbox contents
 mail_start -reuse-spool "--file=%mbox"
@@ -70,7 +70,7 @@ mail_test "Save" \
 	"\"$MU_FOLDER_DIR/gray\"  12/425"
 
 mail_test "file \"$MU_FOLDER_DIR/gray\"" \
-	"Held 1 messages in $MU_FOLDER_DIR/three"
+	"Held 1 message in $MU_FOLDER_DIR/three"
 
 mail_test "headers" \
 	">N   1 Sergey Poznyakoff  Sun Jul 16 12:11  12/425   MBOX"