diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 4b4340a1c..25c77477a 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1185,41 +1185,38 @@ async fn create_or_lookup_group(
                 )
                 .await;
             X_MrAddToGrp = Some(optional_field);
-        } else {
-            if let Some(old_name) = mime_parser.get(HeaderDef::ChatGroupNameChanged) {
-                X_MrGrpNameChanged = true;
-                better_msg = context
-                    .stock_system_msg(
-                        StockMessage::MsgGrpName,
-                        old_name,
-                        if let Some(ref name) = grpname {
-                            name
-                        } else {
-                            ""
-                        },
-                        from_id as u32,
-                    )
-                    .await;
-
-                mime_parser.is_system_message = SystemMessage::GroupNameChanged;
-            } else if let Some(value) = mime_parser.get(HeaderDef::ChatContent) {
-                if value == "group-avatar-changed" {
-                    if let Some(avatar_action) = &mime_parser.group_avatar {
-                        // this is just an explicit message containing the group-avatar,
-                        // apart from that, the group-avatar is send along with various other messages
-                        mime_parser.is_system_message = SystemMessage::GroupImageChanged;
-                        better_msg = context
-                            .stock_system_msg(
-                                match avatar_action {
-                                    AvatarAction::Delete => StockMessage::MsgGrpImgDeleted,
-                                    AvatarAction::Change(_) => StockMessage::MsgGrpImgChanged,
-                                },
-                                "",
-                                "",
-                                from_id as u32,
-                            )
-                            .await
-                    }
+        } else if let Some(old_name) = mime_parser.get(HeaderDef::ChatGroupNameChanged) {
+            X_MrGrpNameChanged = true;
+            better_msg = context
+                .stock_system_msg(
+                    StockMessage::MsgGrpName,
+                    old_name,
+                    if let Some(ref name) = grpname {
+                        name
+                    } else {
+                        ""
+                    },
+                    from_id as u32,
+                )
+                .await;
+            mime_parser.is_system_message = SystemMessage::GroupNameChanged;
+        } else if let Some(value) = mime_parser.get(HeaderDef::ChatContent) {
+            if value == "group-avatar-changed" {
+                if let Some(avatar_action) = &mime_parser.group_avatar {
+                    // this is just an explicit message containing the group-avatar,
+                    // apart from that, the group-avatar is send along with various other messages
+                    mime_parser.is_system_message = SystemMessage::GroupImageChanged;
+                    better_msg = context
+                        .stock_system_msg(
+                            match avatar_action {
+                                AvatarAction::Delete => StockMessage::MsgGrpImgDeleted,
+                                AvatarAction::Change(_) => StockMessage::MsgGrpImgChanged,
+                            },
+                            "",
+                            "",
+                            from_id as u32,
+                        )
+                        .await
                 }
             }
         }
diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index a9361f353..8ec10fabf 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -756,7 +756,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                     let old_name = self.msg.param.get(Param::Arg).unwrap_or_default();
                     protected_headers.push(Header::new(
                         "Chat-Group-Name-Changed".into(),
-                        maybe_encode_words(old_name.into()),
+                        maybe_encode_words(old_name),
                     ));
                 }
                 SystemMessage::GroupImageChanged => {