Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / modules / imap / imap_store.c

diff --git a/citadel/modules/imap/imap_store.c b/citadel/modules/imap/imap_store.c
index 959e1235d783391abf8f6758fd872fccf82f55fb..8c4188bdbb93118c01f8b881662f4342ff3457f1 100644 (file)
--- a/citadel/modules/imap/imap_store.c
+++ b/citadel/modules/imap/imap_store.c
@@ -53,6 +53,7 @@
 #include "config.h"
 #include "user_ops.h"
 #include "database.h"
+#include "room_ops.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
 #include "serv_imap.h"
@@ -195,14 +196,8 @@ void imap_do_store(citimap_command *Cmd) {
        }
 
        free(ss_msglist);
-
-       /*
-        * The following two commands implement "instant expunge" if enabled.
-        */
-       if (config.c_instant_expunge) {
-               imap_do_expunge();
-               imap_rescan_msgids();
-       }
+       imap_do_expunge();              // Citadel always expunges immediately.
+       imap_rescan_msgids();
 }