diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 585976b4b..4b4340a1c 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1186,13 +1186,12 @@ async fn create_or_lookup_group(
                 .await;
             X_MrAddToGrp = Some(optional_field);
         } else {
-            let field = mime_parser.get(HeaderDef::ChatGroupNameChanged);
-            if let Some(field) = field {
+            if let Some(old_name) = mime_parser.get(HeaderDef::ChatGroupNameChanged) {
                 X_MrGrpNameChanged = true;
                 better_msg = context
                     .stock_system_msg(
                         StockMessage::MsgGrpName,
-                        field,
+                        old_name,
                         if let Some(ref name) = grpname {
                             name
                         } else {
diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index d8fb8c6fd..a9361f353 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -753,11 +753,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                     }
                 }
                 SystemMessage::GroupNameChanged => {
-                    let value_to_add = self.msg.param.get(Param::Arg).unwrap_or_default();
-
+                    let old_name = self.msg.param.get(Param::Arg).unwrap_or_default();
                     protected_headers.push(Header::new(
                         "Chat-Group-Name-Changed".into(),
-                        value_to_add.into(),
+                        maybe_encode_words(old_name.into()),
                     ));
                 }
                 SystemMessage::GroupImageChanged => {