diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index febdccd9c3..9e6d454fe9 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -268,6 +268,12 @@ module.exports = React.createClass({
                     but for now be warned.
                 </div>,
             button: "Sign out",
+            extraButtons: [
+                <button className="mx_Dialog_primary"
+                        onClick={this._onExportE2eKeysClicked}>
+                    Export E2E room keys
+                </button>
+            ],
             onFinished: (confirmed) => {
                 if (confirmed) {
                     dis.dispatch({action: 'logout'});
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 0260fc29e2..6012541b94 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -21,10 +21,8 @@ export default React.createClass({
     displayName: 'QuestionDialog',
     propTypes: {
         title: React.PropTypes.string,
-        description: React.PropTypes.oneOfType([
-            React.PropTypes.element,
-            React.PropTypes.string,
-        ]),
+        description: React.PropTypes.node,
+        extraButtons: React.PropTypes.node,
         button: React.PropTypes.string,
         focus: React.PropTypes.bool,
         onFinished: React.PropTypes.func.isRequired,
@@ -34,6 +32,7 @@ export default React.createClass({
         return {
             title: "",
             description: "",
+            extraButtons: null,
             button: "OK",
             focus: true,
             hasCancelButton: true,
@@ -67,6 +66,7 @@ export default React.createClass({
                     <button className="mx_Dialog_primary" onClick={this.onOk} autoFocus={this.props.focus}>
                         {this.props.button}
                     </button>
+                    {this.props.extraButtons}
                     {cancelButton}
                 </div>
             </BaseDialog>