diff -ruN mailsync-5.2.1.orig/src/commandline.cc mailsync-5.2.1/src/commandline.cc
--- mailsync-5.2.1.orig/src/commandline.cc	2004-06-14 00:42:17.000000000 +0200
+++ mailsync-5.2.1/src/commandline.cc	2004-11-22 19:44:15.208025928 +0200
@@ -35,6 +35,7 @@
   printf("  -D       delete any empty mailboxes after synchronizing\n");
   printf("  -m       show from, subject, etc. of messages that get expunged or moved\n");
   printf("  -M       also show message-ids (turns on -m)\n");
+  printf("  -N       don't create new mailboxes\n");
   printf("  -s       simulate\n");
   printf("  -d       show debug info\n");
   printf("  -di      debug/log IMAP protocol telemetry\n");
@@ -82,6 +83,9 @@
       options.show_summary = 0;
       options.show_message_id = 1;
       break;
+    case 'N':
+      options.create_mailboxes = 0;
+      break;
     case 's':
       printf("Only simulating\n");
       options.simulate = 1;
diff -ruN mailsync-5.2.1.orig/src/options.h mailsync-5.2.1/src/options.h
--- mailsync-5.2.1.orig/src/options.h	2004-06-14 00:41:50.000000000 +0200
+++ mailsync-5.2.1/src/options.h	2004-11-22 19:44:19.330399232 +0200
@@ -18,6 +18,7 @@
   bool show_summary;           // 1 line of output per mailbox
   bool show_from;              // 1 line of output per message
   bool show_message_id;        // Implies show_from
+  bool create_mailboxes;
   bool delete_messages;
   bool delete_empty_mailboxes;
   bool debug;
@@ -38,6 +39,7 @@
                show_summary(1),
                show_from(0),
                show_message_id(0),
+               create_mailboxes(1),
                delete_messages(1),
                delete_empty_mailboxes(0),
                debug(0),
diff -ruN mailsync-5.2.1.orig/src/store.cc mailsync-5.2.1/src/store.cc
--- mailsync-5.2.1.orig/src/store.cc	2004-06-14 09:30:39.000000000 +0200
+++ mailsync-5.2.1/src/store.cc	2004-11-22 19:53:31.275490824 +0200
@@ -182,6 +182,9 @@
     printf( "Creating %s in %s\n", boxname.c_str(), this->name.c_str());
     return false;
   }
+
+  // -N option: just return false - main handles this gracefully
+  if ( !options.create_mailboxes ) return false;
   
   bool res;
   bool error_tmp = options.log_error;