diff --git a/mail_menu.c b/mail_menu.c
index 2793766..c5b8ef3 100644
--- a/mail_menu.c
+++ b/mail_menu.c
@@ -1702,7 +1702,12 @@ int mail_menu(struct user_record *user) {
 											break;
 										}
 									}
-									i+=2;
+									if (i == msghs->msg_count - 1) {
+										i = 1;
+									} else {
+										i+=2;
+									}
+									
 								} else {
 									i = 1;
 								}