Include self in To and Chat-Group-Past-Members

Author: link2xt

src/mimefactory.rs

@@ -206,7 +206,7 @@ impl MimeFactory {
                     "SELECT c.authname, c.addr, c.id, cc.add_timestamp, cc.remove_timestamp
                      FROM chats_contacts cc
                      LEFT JOIN contacts c ON cc.contact_id=c.id
-                     WHERE cc.chat_id=? AND cc.contact_id>9",
+                     WHERE cc.chat_id=? AND cc.contact_id>9 OR cc.contact_id=1",
                     (msg.chat_id,),
                     |row| {
                         let authname: String = row.get(0)?;
@@ -219,6 +219,11 @@ impl MimeFactory {
                     |rows| {
                         for row in rows {
                             let (authname, addr, id, add_timestamp, remove_timestamp) = row?;
+                            let addr = if id == ContactId::SELF {
+                                from_addr.to_string()
+                            } else {
+                                addr
+                            };
                             let name = match attach_profile_data {
                                 true => authname,
                                 false => "".to_string(),