---
 alpine/folder.c          |    2 +-
 imap/src/c-client/mail.c |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

Index: alpine-2.11/alpine/folder.c
===================================================================
--- alpine-2.11.orig/alpine/folder.c
+++ alpine-2.11/alpine/folder.c
@@ -6132,7 +6132,7 @@ folder_select_count(long int *count, int
 	    continue;
 
 	  case 14 :		/* toggle comparison */
-	    *cmp = ++(*cmp) % 3;
+	    *cmp = ((*cmp) + 1) % 3;
 	    continue;
 
 	  case -1 :		/* cancel */
Index: alpine-2.11/imap/src/c-client/mail.c
===================================================================
--- alpine-2.11.orig/imap/src/c-client/mail.c
+++ alpine-2.11/imap/src/c-client/mail.c
@@ -2940,8 +2940,14 @@ long mail_parse_date (MESSAGECACHE *elt,
 				/* parse time */
     d = strtoul (s+1,(char **) &s,10);
     if (*s != ':') return NIL;
-    m = strtoul (++s,(char **) &s,10);
-    y = (*s == ':') ? strtoul (++s,(char **) &s,10) : 0;
+    s++;
+    m = strtoul (s,(char **) &s,10);
+    if (*s == ':') {
+	s++;
+	y = strtoul(s, (char **)&s, 10);
+    } else {
+	y = 0;
+    }
 				/* validity check time */
     if ((d > 23) || (m > 59) || (y > 60)) return NIL; 
 				/* set values in elt */