diff --git a/src/Rooms.js b/src/Rooms.js
index 2fda46450f..024a4f1d8c 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -90,8 +90,9 @@ export function looksLikeDirectMessageRoom(room, myUserId) {
         // Used for 1:1 direct chats
         // Show 1:1 chats in seperate "Direct Messages" section as long as they haven't
         // been moved to a different tag section
-        // TODO: Use SUMMARYAPI to take invited users into account 
-        if (room.currentState.getJoinedMemberCount() === 2 && !tagNames.length) {
+        const totalMemberCount = room.currentState.getJoinedMemberCount() +
+            room.currentState.getInvitedMemberCount();
+        if (totalMemberCount === 2 && !tagNames.length) {
             return true;
         }
     }
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index acb1573cbf..d95eda490d 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -96,10 +96,8 @@ export default class DMRoomMap {
         if (this.roomToUser[roomId] === undefined) {
             // no entry? if the room is an invite, look for the is_direct hint.
             const room = this.matrixClient.getRoom(roomId);
-            // TODO Use SUMMARYAPI to fix DM detection?
             if (room) {
-                const me = room.getMember(this.matrixClient.getUserId());
-                return me && me.getDMInviter();
+                return room.getDMInviter();
             }
         }
         return this.roomToUser[roomId];