Fix construction of Chat-Group-Member-Timestamps

Author: link2xt

src/mimefactory.rs

@@ -217,6 +217,8 @@ impl MimeFactory {
                         Ok((authname, addr, id, add_timestamp, remove_timestamp))
                     },
                     |rows| {
+                        let mut past_member_timestamps = Vec::new();
+
                         for row in rows {
                             let (authname, addr, id, add_timestamp, remove_timestamp) = row?;
                             let addr = if id == ContactId::SELF {
@@ -232,15 +234,8 @@ impl MimeFactory {
                                 if !recipients_contain_addr(&to, &addr) {
                                     recipients.push(addr.clone());
                                     if !undisclosed_recipients {
-                                        if let Some(email_to_remove) = email_to_remove {
-                                            if email_to_remove != addr {
-                                                to.push((name, addr));
-                                                member_timestamps.push(add_timestamp);
-                                            }
-                                        } else {
-                                            to.push((name, addr));
-                                            member_timestamps.push(add_timestamp);
-                                        }
+                                        to.push((name, addr));
+                                        member_timestamps.push(add_timestamp);
                                     }
                                 }
                                 recipient_ids.insert(id);
@@ -258,11 +253,13 @@ impl MimeFactory {
                                     }
                                     if !undisclosed_recipients {
                                         past_members.push((name, addr));
-                                        member_timestamps.push(remove_timestamp);
+                                        past_member_timestamps.push(remove_timestamp);
                                     }
                                 }
                             }
                         }
+
+                        member_timestamps.extend(past_member_timestamps);
                         Ok(())
                     },
                 )