diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index 91641bc78..c7b8a2d1b 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -693,6 +693,12 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                         "Chat-Content".to_string(),
                         "group-avatar-changed".to_string(),
                     ));
+                    if grpimage.is_none() {
+                        protected_headers.push(Header::new(
+                            "Chat-Group-Avatar".to_string(),
+                            "0".to_string(),
+                        ));
+                    }
                     add_compatibility_header = true;
                 }
                 _ => {}