diff --git a/skins/base/css/molecules/RoomSettings.css b/skins/base/css/molecules/RoomSettings.css
index 5e32529404..4100b9e3ee 100644
--- a/skins/base/css/molecules/RoomSettings.css
+++ b/skins/base/css/molecules/RoomSettings.css
@@ -14,32 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_RoomSettings_power_levels {
+.mx_RoomSettings_settings {
     display: table;
     margin: 5px 0;
 }
 
-.mx_RoomSettings_power_levels > div {
+.mx_RoomSettings_settings > div {
     display: table-row;
 }
 
-.mx_RoomSettings_power_levels > div > * {
-    display: table-cell;
-
-    margin: 0 10px;
-}
-
-
-.mx_RoomSettings_user_levels {
-    display: table;
-    margin: 5px 0;
-}
-
-.mx_RoomSettings_user_levels > div {
-    display: table-row;
-}
-
-.mx_RoomSettings_user_levels > div > * {
+.mx_RoomSettings_settings > div > * {
     display: table-cell;
 
     margin: 0 10px;
diff --git a/skins/base/views/molecules/RoomSettings.js b/skins/base/views/molecules/RoomSettings.js
index 14197154f1..4f562da092 100644
--- a/skins/base/views/molecules/RoomSettings.js
+++ b/skins/base/views/molecules/RoomSettings.js
@@ -86,6 +86,7 @@ module.exports = React.createClass({
         var default_user_level = parseInt(power_levels.users_default);
 
         var user_levels = power_levels.users;
+        var events_levels = power_levels.events;
 
         var user_id = MatrixClientPeg.get().credentials.userId;
 
@@ -107,7 +108,7 @@ module.exports = React.createClass({
                 <label><input type="checkbox" /> Encrypt room</label> <br/>
 
                 Power levels:
-                <div className="mx_RoomSettings_power_levels">
+                <div className="mx_RoomSettings_power_levels mx_RoomSettings_settings">
                     <div>
                         <label htmlFor="mx_RoomSettings_ban_level">Ban level</label>
                         <input type="text" defaultValue={ban_level} size="3" ref="ban" id="mx_RoomSettings_ban_level"
@@ -147,7 +148,7 @@ module.exports = React.createClass({
                 </div>
 
                 User levels:
-                <div className="mx_RoomSettings_user_levels">
+                <div className="mx_RoomSettings_user_levels mx_RoomSettings_settings">
                     {Object.keys(user_levels).map(function(user, i) {
                         return (
                             <div key={user}>
@@ -157,6 +158,18 @@ module.exports = React.createClass({
                         );
                     })}
                 </div>
+
+                Event levels:
+                <div className="mx_RoomSettings_event_lvels mx_RoomSettings_settings">
+                    {Object.keys(events_levels).map(function(event_type, i) {
+                        return (
+                            <div key={event_type}>
+                                <label htmlFor={"mx_RoomSettings_event_"+i}>{event_type}</label>
+                                <input type="text" defaultValue={events_levels[event_type]} size="3" id={"mx_RoomSettings_event_"+i} disabled/>
+                            </div>
+                        );
+                    })}
+                </div>
             </div>
         );
     }