diff --git a/config.sample.json b/config.sample.json
index 87fc63de03..df17bd3666 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -29,7 +29,8 @@
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",
-        "feature_state_counters": "labs"
+        "feature_state_counters": "labs",
+        "feature_irc_ui": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
index 058203d758..53801e816f 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -106,3 +106,9 @@ adds an ability for end users to add themes themselves by using a URL to the JSO
 theme definition.
 
 For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).
+
+## IRC message layout (`feature_irc_ui`)
+
+Adds an option to change the message layout to an IRC style ` timestamp | avatar
+| name | message `
+
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index 3cff49839b..ebbead5d51 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -22,7 +22,8 @@
         "feature_dm_verification": "labs",
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs"
+        "feature_custom_themes": "labs",
+        "feature_irc_ui": "labs"
     },
     "piwik": {
         "url": "https://piwik.riot.im/",