diff --git a/mail_menu.c b/mail_menu.c
index a827303..3fd0572 100644
--- a/mail_menu.c
+++ b/mail_menu.c
@@ -2652,7 +2652,7 @@ void msg_conf_sub_bases() {
 				s_printf("\r\n");
 				if (strlen(buffer) > 0) {
 					toggle_area = atoi(buffer);
-					msgbase_sub_unsub(gUser->cur_mail_conf, i);
+					msgbase_sub_unsub(gUser->cur_mail_conf, toggle_area);
 					lines = 0;
 					
 					break;
@@ -2667,7 +2667,7 @@ void msg_conf_sub_bases() {
 			s_printf("\r\n");
 			if (strlen(buffer) > 0) {
 				toggle_area = atoi(buffer);
-				msgbase_sub_unsub(gUser->cur_mail_conf, i);
+				msgbase_sub_unsub(gUser->cur_mail_conf, toggle_area);
 				lines = 0;
 			} else {
 				done = 1;
diff --git a/users.c b/users.c
index 17f73ba..6cd3f9e 100644
--- a/users.c
+++ b/users.c
@@ -182,7 +182,7 @@ int msgbase_sub_unsub(int conference, int msgbase) {
     sqlite3_bind_int(res, 2, msgbase);
     sqlite3_bind_int(res, 3, gUser->id);
     
-    sqlite3_step(res);
+    rc = sqlite3_step(res);
     
     sqlite3_finalize(res);
     sqlite3_close(db);