From bc8e7724e8ccb4e90eb27b062fbce8a2a6379297 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Sat, 3 Sep 2016 18:42:54 +0100
Subject: [PATCH] Make the 'encrypt this room' knob be megolm

---
 src/components/views/rooms/RoomSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 145b8559b7..b09001b60a 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -249,7 +249,7 @@ module.exports = React.createClass({
         var roomId = this.props.room.roomId;
         return MatrixClientPeg.get().sendStateEvent(
             roomId, "m.room.encryption",
-            { algorithm: "m.olm.v1.curve25519-aes-sha2" }
+            { algorithm: "m.megolm.v1.aes-sha2" }
         );
     },