diff --git a/NextcloudTalk/RoomSearchTableViewController.m b/NextcloudTalk/RoomSearchTableViewController.m
index f0f227163..c2575fc36 100644
--- a/NextcloudTalk/RoomSearchTableViewController.m
+++ b/NextcloudTalk/RoomSearchTableViewController.m
@@ -54,9 +54,10 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     [self.tableView registerNib:[UINib nibWithNibName:kRoomTableCellNibName bundle:nil] forCellReuseIdentifier:kRoomCellIdentifier];
-    // Align header's title to ContactsTableViewCell's label
-    self.tableView.separatorInset = UIEdgeInsetsMake(0, 72, 0, 0);
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
+    // Align header's title to ContactsTableViewCell's label
+    self.tableView.separatorInset = UIEdgeInsetsMake(0, 52, 0, 0);
+    self.tableView.separatorInsetReference = UITableViewSeparatorInsetFromAutomaticInsets;
     // Contacts placeholder view
     _roomSearchBackgroundView = [[PlaceholderView alloc] init];
     [_roomSearchBackgroundView setImage:[UIImage imageNamed:@"conversations-placeholder"]];
diff --git a/NextcloudTalk/RoomsTableViewController.m b/NextcloudTalk/RoomsTableViewController.m
index 8a29a72b2..3437d7f81 100644
--- a/NextcloudTalk/RoomsTableViewController.m
+++ b/NextcloudTalk/RoomsTableViewController.m
@@ -90,8 +90,9 @@ - (void)viewDidLoad
     
     [self.tableView registerNib:[UINib nibWithNibName:kRoomTableCellNibName bundle:nil] forCellReuseIdentifier:kRoomCellIdentifier];
     // Align header's title to ContactsTableViewCell's label
-    self.tableView.separatorInset = UIEdgeInsetsMake(0, 72, 0, 0);
-    
+    self.tableView.separatorInset = UIEdgeInsetsMake(0, 52, 0, 0);
+    self.tableView.separatorInsetReference = UITableViewSeparatorInsetFromAutomaticInsets;
+
     self.addButton.accessibilityLabel = NSLocalizedString(@"Create a new conversation", nil);
     self.addButton.accessibilityHint = NSLocalizedString(@"Double tap to create group, public or one to one conversations.", nil);