*Always* require a recipient in the Mail> room,

regardless of the view setting.

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 6cc3b33d6ab6d205344e259862ecdb24fd197240..5eb729f1084ab9ad9347a78ff06be2f74dd3f648 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -3415,10 +3415,13 @@ void cmd_ent0(char *entargs)
 
        /* In mailbox rooms we have to behave a little differently --
         * make sure the user has specified at least one recipient.  Then
-        * validate the recipient(s).
+        * validate the recipient(s).  We do this for the Mail> room, as
+        * well as any room which has the "Mailbox" view set.
         */
-       if ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) ) {
 
+       if (  ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) )
+          || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) )
+       ) {
                if (CC->user.axlevel < 2) {
                        strcpy(recp, "sysop");
                        strcpy(cc, "");