From 180c124b8026931dbd5adfec1f3d861def95e5bf Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@yandex.com>
Date: Tue, 10 Oct 2017 11:16:34 +1000
Subject: [PATCH] Check for new mail in subscribed areas

---
 magicka.strings | 2 +-
 src/mail_menu.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/magicka.strings b/magicka.strings
index e88c26a..c33da2d 100644
--- a/magicka.strings
+++ b/magicka.strings
@@ -137,7 +137,7 @@ Enter the conference number:
   %d. %s\r\n
 Enter the area number: 
 \r\nInvalid area number!\r\n
-\r\nScan for new mail? (Y/N) : 
+\r\nScan for new mail? (Y/N/S): 
 \r\n\e[1;32m%d. %s\e[0m\r\n
 \e[1;37m   --> %d. %s (%d new)\e[0m\r\n
 \r\n\e[0mTL: %dm :> 
diff --git a/src/mail_menu.c b/src/mail_menu.c
index 374c13a..0e3eb9e 100644
--- a/src/mail_menu.c
+++ b/src/mail_menu.c
@@ -2590,7 +2590,7 @@ void mail_scan(struct user_record *user) {
 	s_printf(get_string(139));
 	c = s_getc();
 
-	if (tolower(c) == 'y') {
+	if (tolower(c) == 'y' || tolower(c) == 's') {
 		for (i=0;i<conf.mail_conference_count;i++) {
 			if (conf.mail_conferences[i]->sec_level > user->sec_level) {
 				continue;
@@ -2606,6 +2606,11 @@ void mail_scan(struct user_record *user) {
 				if (conf.mail_conferences[i]->mail_areas[j]->read_sec_level > user->sec_level) {
 					continue;
 				}
+				
+				if (tolower(c) == 's' && !msgbase_is_subscribed(i, j)) {
+					continue;
+				}
+				
 				jb = open_jam_base(conf.mail_conferences[i]->mail_areas[j]->path);
 				if (!jb) {
 					dolog("Unable to open message base");