diff --git a/NextcloudTalk/NCDatabaseManager.m b/NextcloudTalk/NCDatabaseManager.m
index 4a9a5f9d..88b5c294 100644
--- a/NextcloudTalk/NCDatabaseManager.m
+++ b/NextcloudTalk/NCDatabaseManager.m
@@ -89,11 +89,6 @@ NSString * const kMinimumRequiredTalkCapability     = kCapabilitySystemMessages;
         configuration.schemaVersion = kTalkDatabaseSchemaVersion;
         configuration.migrationBlock = ^(RLMMigration *migration, uint64_t oldSchemaVersion) {
             // At the very minimum we need to update the version with an empty block to indicate that the schema has been upgraded (automatically) by Realm
-            if (oldSchemaVersion < kTalkDatabaseSchemaVersion) {
-                   // Nothing to do!
-                   // Realm will automatically detect new properties and removed properties
-                   // And will update the schema on disk automatically
-               }
         };
         
         // Tell Realm to use this new configuration object for the default Realm
diff --git a/NextcloudTalk/RoomTableViewCell.h b/NextcloudTalk/RoomTableViewCell.h
index cd678c60..2b20c89f 100644
--- a/NextcloudTalk/RoomTableViewCell.h
+++ b/NextcloudTalk/RoomTableViewCell.h
@@ -42,5 +42,5 @@ extern CGFloat const kRoomTableCellHeight;
 
 - (void)setUnreadMessages:(NSInteger)number mentioned:(BOOL)mentioned groupMentioned:(BOOL)groupMentioned;
 - (void)setUserStatus:(NSString *)userStatus;
--(void)setUserStatusIcon:(NSString *)userStatusIcon;
+- (void)setUserStatusIcon:(NSString *)userStatusIcon;
 @end
diff --git a/NextcloudTalk/RoomsTableViewController.m b/NextcloudTalk/RoomsTableViewController.m
index 59c1de48..c66c8845 100644
--- a/NextcloudTalk/RoomsTableViewController.m
+++ b/NextcloudTalk/RoomsTableViewController.m
@@ -1141,20 +1141,13 @@ API_AVAILABLE(ios(11.0)){
     }
 
     //Show User Status
-    if (room.type == kNCRoomTypeOneToOne) {
-        if ([room.status length] != 0) {
-            if (![room.status isEqual:@"dnd"]) {
-                if ([room.statusIcon length] != 0) {
-                    [cell setUserStatusIcon:room.statusIcon];
-                }
-                else {
-                    [cell setUserStatus:room.status];
-                }
-            }else {
-                    [cell setUserStatus:room.status];
-                }
-            }
+    if (room.type == kNCRoomTypeOneToOne && [room.status length] != 0) {
+        if (![room.status isEqual:@"dnd"] && [room.statusIcon length] != 0) {
+            [cell setUserStatusIcon:room.statusIcon];
+        } else {
+            [cell setUserStatus:room.status];
         }
+    }
     
     // Set objectType image
     if ([room.objectType isEqualToString:NCRoomObjectTypeFile]) {