3 files changed, 14 insertions, 2 deletions
diff --git a/src/modules/config.js b/src/modules/config.js
index 522940f6..0d36e9bf 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -5,7 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0]
 
 const defaultState = {
   colors: {},
-  collapseMessageWithSubject: undefined,
+  collapseMessageWithSubject: undefined, // instance default
   hideAttachments: false,
   hideAttachmentsInConv: false,
   hideNsfw: true,
@@ -25,7 +25,9 @@ const defaultState = {
   },
   muteWords: [],
   highlight: {},
-  interfaceLanguage: browserLocale
+  interfaceLanguage: browserLocale,
+  scopeCopy: undefined, // instance default
+  subjectLineBehavior: undefined // instance default
 }
 
 const config = {
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 8b2c03d2..9a39cccf 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -21,6 +21,8 @@ const defaultState = {
   hidePostStats: false,
   hideUserStats: false,
   disableChat: false,
+  scopeCopy: true,
+  subjectLineBehavior: 'email',
   loginMethod: 'password',
 
   // Nasty stuff
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 89e00119..2c3d2550 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -172,6 +172,14 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
           sortTimeline(mentions)
         }
       }
+      if (status.visibility === 'direct') {
+        const dms = state.timelines.dms
+
+        mergeOrAdd(dms.statuses, dms.statusesObject, status)
+        dms.newStatusCount += 1
+
+        sortTimeline(dms)
+      }
     }
 
     // Decide if we should treat the status as new for this timeline.