1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index aef65fa..06ed3a0 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -2696,7 +2696,7 @@ namespace QuickMedia {
     }
 
     bool message_is_timeline(Message *message) {
-        return message->type >= MessageType::TEXT && message->type <= MessageType::FILE;
+        return (message->type >= MessageType::TEXT && message->type <= MessageType::FILE) || message->type == MessageType::UNIMPLEMENTED;
     }
 
     void Matrix::append_system_message(RoomData *room_data, std::shared_ptr<Message> message) {
@@ -3507,11 +3507,13 @@ namespace QuickMedia {
         // Parse local part
         for(; index < size; ++index) {
             char c = str[index];
-            if((c >= 'a' && c <= 'z') || c == '-' || c == '.' || c == '=' || c == '_' || c == '/') {
+            if((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.' || c == '=' || c == '_') {
 
             } else if(c == ':') {
                 found_colon = true;
                 break;
+            } else {
+                return {};
             }
         }