Include memo mail information in ms_info

1 files changed, 21 insertions, 4 deletions

diff --git a/modules/commands/ms_info.cpp b/modules/commands/ms_info.cpp
index 00df72769..9a4b28142 100644
--- a/modules/commands/ms_info.cpp
+++ b/modules/commands/ms_info.cpp
@@ -168,15 +168,32 @@ class CommandMSInfo : public Command
 			else
 				source.Reply(_("You have no limit on the number of memos you may keep."));
 
-			/* Ripped too. But differently because of a seg fault (loughs) */
+			bool memo_mail = nc->HasExt("MEMO_MAIL");
 			if (nc->HasExt("MEMO_RECEIVE") && nc->HasExt("MEMO_SIGNON"))
-				source.Reply(_("You will be notified of new memos at logon and when they arrive."));
+			{
+				if (memo_mail)
+					source.Reply(_("You will be notified of new memos at logon and when they arrive, and by mail when they arrive."));
+				else
+					source.Reply(_("You will be notified of new memos at logon and when they arrive."));
+			}
 			else if (nc->HasExt("MEMO_RECEIVE"))
-				source.Reply(_("You will be notified when new memos arrive."));
+			{
+				if (memo_mail)
+					source.Reply(_("You will be notified by message and by mail when new memos arrive."));
+				else
+					source.Reply(_("You will be notified when new memos arrive."));
+			}
 			else if (nc->HasExt("MEMO_SIGNON"))
-				source.Reply(_("You will be notified of new memos at logon."));
+			{
+				if (memo_mail)
+					source.Reply(_("You will be notified of new memos at logon, and by mail when they arrive."));
+				else
+					source.Reply(_("You will be notified of new memos at logon."));
+			}
 			else
+			{
 				source.Reply(_("You will not be notified of new memos."));
+			}
 		}
 	}