diff --git a/common/content/modes.js b/common/content/modes.js
index 3099662b..fd772eec 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -275,11 +275,6 @@ const modes = (function () //{{{
     self.addMode("CARET"); // text cursor is visible
     self.addMode("TEXTAREA", { char: "i" }); // text cursor is in a HTMLTextAreaElement
     self.addMode("CUSTOM",  { display: function () plugins.mode });
-    // FIXME: These belong elsewhere
-    //   So too, probably, do most of the others.
-    self.addMode("MESSAGE", { char: "m" }); // for now only used in Muttator when the message has focus
-    self.addMode("COMPOSE");
-    self.addMode("PLAYER",  { char: "p" }); // Player mode for songbird
     // extended modes, can include multiple modes, and even main modes
     self.addMode("EX", true);
     self.addMode("HINTS", true);
@@ -293,6 +288,9 @@ const modes = (function () //{{{
     self.addMode("LINE", true); // linewise visual mode
     self.addMode("PROMPT", true);
 
+    if (config.modes)
+        config.modes.forEach(function (mode) { self.addMode.apply(self, mode) });
+
     return self;
     //}}}
 })(); //}}}
diff --git a/muttator/content/config.js b/muttator/content/config.js
index a9c7980a..51287251 100644
--- a/muttator/content/config.js
+++ b/muttator/content/config.js
@@ -123,6 +123,11 @@ const config = { //{{{
         "various.html"
         ],*/
 
+    modes: [
+        ["MESSAGE", { char: "m" }],
+        ["COMPOSE"]
+    ],
+
     optionDefaults: {
         showtabline: 1,
     },
diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index f9533205..e0c477f9 100644
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -163,6 +163,8 @@ const config = { //{{{
         "developer.html", "various.html", "index.html", "version.html"
     ],
 
+    modes: [["PLAYER", { char: "p" }]],
+
     optionDefaults: {
         showtabline: 2,
     },