diff --git a/mail_menu.c b/mail_menu.c
index da2d554..2589ee6 100644
--- a/mail_menu.c
+++ b/mail_menu.c
@@ -261,8 +261,8 @@ struct msg_headers *read_message_headers(int msgconf, int msgarea, struct user_r
 			JAM_DelSubPacket(jsp);
 
 			if (jmh.Attribute & MSG_PRIVATE) {
-				if (!msg_is_to(gUser, jamm->to, jamm->daddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf) &&
-				    !msg_is_from(gUser, jamm->from, jamm->oaddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf)) {
+				if (!msg_is_to(user, jamm->to, jamm->daddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf) &&
+				    !msg_is_from(user, jamm->from, jamm->oaddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf)) {
 
 					if (jamm->subject != NULL) {
 						free(jamm->subject);
diff --git a/www_msgs.c b/www_msgs.c
index 3a7c1cf..493399c 100644
--- a/www_msgs.c
+++ b/www_msgs.c
@@ -295,7 +295,7 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 					free(replyid);
 				}
 				JAM_CloseMB(jb);
-					return NULL;
+				return NULL;
 			}
 		}
 		body = (char *)malloc(jmh.TxtLen);