diff --git a/src/constants.rs b/src/constants.rs
index ac956be43..de50237fc 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -491,3 +491,12 @@ pub enum KeyType {
     Public = 0,
     Private = 1,
 }
+
+pub const DC_CMD_GROUPNAME_CHANGED: libc::c_int = 2;
+pub const DC_CMD_GROUPIMAGE_CHANGED: libc::c_int = 3;
+pub const DC_CMD_MEMBER_ADDED_TO_GROUP: libc::c_int = 4;
+pub const DC_CMD_MEMBER_REMOVED_FROM_GROUP: libc::c_int = 5;
+pub const DC_CMD_AUTOCRYPT_SETUP_MESSAGE: libc::c_int = 6;
+pub const DC_CMD_SECUREJOIN_MESSAGE: libc::c_int = 7;
+pub const DC_CMD_LOCATION_STREAMING_ENABLED: libc::c_int = 8;
+pub const DC_CMD_LOCATION_ONLY: libc::c_int = 9;
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 913d76380..ae71b4827 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -215,7 +215,9 @@ pub unsafe fn dc_receive_imf(
                         maybe this can be optimized later,
                         by checking the state before the message body is downloaded */
                         let mut allow_creation: libc::c_int = 1;
-                        if msgrmsg == 0 {
+                        if mime_parser.is_system_message != DC_CMD_AUTOCRYPT_SETUP_MESSAGE
+                            && msgrmsg == 0
+                        {
                             let show_emails = context
                                 .sql
                                 .get_config_int(context, "show_emails")