---
 imap/src/osdep/unix/dummy.c |   17 ++++++++++++-----
 pith/send.c                 |    1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

Index: alpine-2.25/imap/src/osdep/unix/dummy.c
===================================================================
--- alpine-2.25.orig/imap/src/osdep/unix/dummy.c
+++ alpine-2.25/imap/src/osdep/unix/dummy.c
@@ -735,6 +735,17 @@ long dummy_copy (MAILSTREAM *stream,char
   return NIL;
 }
 
+static MAILSTREAM *dummy_rewrite_code(MAILSTREAM *ts)
+{
+  if (ts)
+     return ts;
+
+  ts = default_proto (NIL);
+  if (!(*ts->dtb->create)(ts,"INBOX"))
+    return NIL;
+  
+  return ts;
+}
 
 /* Dummy append message string
  * Accepts: mail stream
@@ -754,11 +765,7 @@ long dummy_append (MAILSTREAM *stream,ch
 				/* append to INBOX? */
   if (!compare_cstring (mailbox,"INBOX")) {
 				/* yes, if no empty proto try creating */
-    if (!ts){
-	ts = default_proto (NIL);
-	if(!(*ts->dtb->create)(ts,"INBOX"))
-	   ts = NIL;
-    }
+    ts = dummy_rewrite_code(ts);
   }
   else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) {
     if ((e = errno) == ENOENT) /* failed, was it no such file? */
Index: alpine-2.25/pith/send.c
===================================================================
--- alpine-2.25.orig/pith/send.c
+++ alpine-2.25/pith/send.c
@@ -4165,6 +4165,7 @@ set_parameter(PARAMETER **param, char *p
 	      pm->value = cpystr(new_value);
 	}
     }
+    return 0;
 }