diff --git a/RiotShareExtension/Modules/Share/DataSources/ShareDataSource.m b/RiotShareExtension/Modules/Share/DataSources/ShareDataSource.m
index c454c5e74..52e1f8f69 100644
--- a/RiotShareExtension/Modules/Share/DataSources/ShareDataSource.m
+++ b/RiotShareExtension/Modules/Share/DataSources/ShareDataSource.m
@@ -74,17 +74,8 @@
         
         // Sort rooms according to their last messages (most recent first)
         NSComparator comparator = ^NSComparisonResult(MXKRecentCellData *recentCellData1, MXKRecentCellData *recentCellData2) {
-            
-            NSComparisonResult result = NSOrderedAscending;
-            if (recentCellData2.roomSummary.lastMessageOriginServerTs > recentCellData1.roomSummary.lastMessageOriginServerTs)
-            {
-                result = NSOrderedDescending;
-            }
-            else if (recentCellData2.roomSummary.lastMessageOriginServerTs == recentCellData1.roomSummary.lastMessageOriginServerTs)
-            {
-                result = NSOrderedSame;
-            }
-            return result;
+
+            return [recentCellData1.roomSummary.lastMessage compareOriginServerTs:recentCellData2.roomSummary.lastMessage];
         };
         [cellData sortUsingComparator:comparator];