diff --git a/mu/mu-config.cc b/mu/mu-config.cc
index 9519e01a..0527b9d4 100644
--- a/mu/mu-config.cc
+++ b/mu/mu-config.cc
@@ -144,10 +144,17 @@ config_options_group_init (void)
 		{"my-address", 0, 0, G_OPTION_ARG_STRING_ARRAY,
 		 &MU_CONFIG.my_addresses, "my e-mail address; can be used multiple times",
 		 "<address>"},
+                {"max-message-size", 0, 0, G_OPTION_ARG_INT,
+		 &MU_CONFIG.max_msg_size, "Maximum allowed size for messages",
+                 "<size-in-bytes>"},
+                {"batch-size", 0, 0, G_OPTION_ARG_INT,
+		 &MU_CONFIG.max_msg_size,
+                 "Number of changes in a database transaction batch",
+                 "<number>"},
                 {NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}
 	};
 
-	og = g_option_group_new("init", "Options for the 'index' command",
+	og = g_option_group_new("init", "Options for the 'init' command",
 				"", NULL, NULL);
 	g_option_group_add_entries(og, entries);
 
diff --git a/mu/mu-config.hh b/mu/mu-config.hh
index cd077f87..84931033 100644
--- a/mu/mu-config.hh
+++ b/mu/mu-config.hh
@@ -109,16 +109,18 @@ struct _MuConfig {
 
         /* options for init */
         gchar	        *maildir;	/* where the mails are */
-        char**          my_addresses;   /* 'my e-mail address', for mu
-                                         * cfind; can be use multiple
-                                         * times */
+        char**          my_addresses;   /* 'my e-mail address', for mu cfind;
+                                         * can be use multiple times */
+        int		max_msg_size;    /* maximum size for message files */
+        int		batch_size;      /* database transaction batch size */
+
 	/* options for indexing */
 
 	gboolean        nocleanup;	/* don't cleanup del'd mails from db */
 	gboolean        rebuild;	/* empty the database before indexing */
 	gboolean        lazycheck;      /* don't check dirs with up-to-date
 					 * timestamps */
-	int		max_msg_size;   /* maximum size for message files */
+
 
 	/* options for querying 'find' (and view-> 'summary') */
 	gchar		*fields;	/* fields to show in output */