Merge branch 'master' into bwindels/upload-images

src/domain/session/room/RoomViewModel.js

@@ -148,8 +148,8 @@ export class RoomViewModel extends ViewModel {
         if (message) {
             try {
                 let msgtype = "m.text";
-                if (message.startsWith("/me")) {
-                    message = message.substr(3).trim();
+                if (message.startsWith("/me ")) {
+                    message = message.substr(4).trim();
                     msgtype = "m.emote";
                 }
                 await this._room.sendEvent("m.room.message", {msgtype, body: message});

src/platform/web/ui/css/layout.css

@@ -170,3 +170,13 @@ main {
     position: absolute;
     z-index: 2;
 }
+
+.Settings {
+    display: flex;
+    flex-direction: column;
+}
+
+.SettingsBody {
+    min-height: 0;
+    overflow-y: auto;
+}