Merge remote-tracking branch 'origin/Applications/16.04'

kmail/src/editor/kmcomposerwin.cpp

@@ -450,7 +450,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState
     connect(kmkernel->folderCollectionMonitor(), &Akonadi::Monitor::collectionRemoved, this, &KMComposerWin::slotFolderRemoved);
     connect(kmkernel, &KMKernel::configChanged, this, &KMComposerWin::slotConfigChanged);
 
-    mMainWidget->resize(480, 510);
+    mMainWidget->resize(800, 600);
     setCentralWidget(mMainWidget);
 
     if (KMailSettings::self()->useHtmlMarkup()) {

kmail/src/settings/kmail.kcfg.cmake

@@ -268,7 +268,7 @@
 
     <group name="Geometry">
       <entry name="ComposerSize" type="Size" key="composer">
-        <default>QSize(480,510)</default>
+        <default>QSize(800,600)</default>
       </entry>
       <entry name="IdentityDialogSize" type="Size" key="Identity Dialog size">
         <label>The size of the identity dialog (for internal use only)</label>