Merge master and fix conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/RoomInfoListItem.cpp b/src/RoomInfoListItem.cpp

index ad774360..f234b59b 100644
--- a/src/RoomInfoListItem.cpp
+++ b/src/RoomInfoListItem.cpp
@@ -451,7 +451,7 @@ RoomInfoListItem::calculateImportance() const
         // returns ImportanceDisabled or Invite
         if (isInvite()) {
                 return Invite;
-        } else if (!settings->isSortByImportanceEnabled()) {
+        } else if (!settings->sortByImportance()) {
                 return ImportanceDisabled;
         } else if (unreadHighlightedMsgCount_) {
                 return NewMentions;