diff --git a/config.sample.json b/config.sample.json
index 360a47a7f4..8497bba489 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -26,6 +26,7 @@
     "defaultCountryCode": "GB",
     "showLabsSettings": false,
     "features": {
+        "feature_alternate_message_layouts": "labs",
         "feature_font_scaling": "labs",
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
diff --git a/docs/labs.md b/docs/labs.md
index 6dcd823f96..802722a9cc 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -12,6 +12,10 @@ dropped. Ask in the room if you are unclear about any details here.**
 Enables font scaling options for accessibility. To alter the scale check the
 appearance tab in settings.
 
+## Alternate message layouts (`feature_alternate_message_layouts`)
+
+Enables options in rooms settings to switch between message layouts such as the default and "irc-like" layouts.
+
 ## Message pinning (`feature_pinning`)
 
 Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index bdc688a3e6..bd949dec7c 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -13,6 +13,7 @@
     "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
+        "feature_alternate_message_layouts": "labs",
         "feature_font_scaling": "labs",
         "feature_pinning": "labs",
         "feature_custom_status": "labs",