diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 8cb9ea664..6f9a2f8b9 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -35,6 +35,7 @@ set(client_UI_SRCS
     addcertificatedialog.ui
     proxyauthdialog.ui
     notificationwidget.ui
+    mnemonicdialog.ui
     wizard/owncloudadvancedsetuppage.ui
     wizard/owncloudconnectionmethoddialog.ui
     wizard/owncloudhttpcredspage.ui
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 45b75b3e3..ae144bcca 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -25,6 +25,7 @@
 #include <QNetworkAccessManager>
 #include <QMessageBox>
 #include "clientsideencryption.h"
+#include "ui_mnemonicdialog.h"
 
 namespace {
 static const char urlC[] = "url";
@@ -335,16 +336,19 @@ AccountPtr AccountManager::createAccount()
 
 void AccountManager::displayMnemonic(const QString& mnemonic)
 {
-    QMessageBox msgBox;
-    msgBox.setText(tr("All 12 words together make a very strong password, "
-                      "letting only you view and make use of your encrypted files. "
-                      "Please write it down and keep it somewhere safe."));
-    msgBox.setDetailedText(mnemonic);
-    msgBox.setWindowTitle(tr("Make note of your 12 word encryption password"));
-    msgBox.setIcon(QMessageBox::Information);
-    msgBox.setStandardButtons(QMessageBox::Ok);
-
-    msgBox.exec();
+    QDialog *widget = new QDialog;
+    Ui_Dialog ui;
+    ui.setupUi(widget);
+    widget->setWindowTitle(tr("End to end encryption mnemonic"));
+    ui.label->setText(tr("To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words."
+                         "Please note these down and keep them safe. "
+                         "They will be needed to add other devices to your account (like your mobile phone or laptop)."));
+    ui.textEdit->setText(mnemonic);
+    ui.textEdit->focusWidget();
+    ui.textEdit->selectAll();
+    ui.textEdit->setAlignment(Qt::AlignCenter);
+    widget->exec();
+    widget->resize(widget->sizeHint());
 }
 void AccountManager::shutdown()
 {
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index e4d7c372a..1e3183cc2 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -284,10 +284,7 @@ void AccountSettings::doExpand()
 }
 
 void AccountSettings::slotShowMnemonic(const QString &mnemonic) {
-    QMessageBox msgBox;
-    msgBox.setText(tr("Your end to end encryption mnemonic is:"));
-    msgBox.setInformativeText(mnemonic);
-    msgBox.exec();
+    AccountManager::instance()->displayMnemonic(mnemonic);
 }
 
 void AccountSettings::slotEncryptionFlagSuccess(const QByteArray& fileId)
diff --git a/src/gui/mnemonicdialog.ui b/src/gui/mnemonicdialog.ui
new file mode 100644
index 000000000..e0b804f13
--- /dev/null
+++ b/src/gui/mnemonicdialog.ui
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>588</width>
+    <height>214</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>false</bool>
+  </property>
+  <property name="modal">
+   <bool>false</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMinimumSize</enum>
+     </property>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>50</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="sizeIncrement">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Label</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QTextEdit" name="textEdit">
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>80</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>