diff --git a/editor/kmcomposereditorng.cpp b/editor/kmcomposereditorng.cpp
index d51d00690..4fb50ca01 100644
--- a/editor/kmcomposereditorng.cpp
+++ b/editor/kmcomposereditorng.cpp
@@ -15,7 +15,6 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-
 #include "kmcomposereditorng.h"
 #include "kmcomposewin.h"
 #include "kmkernel.h"
@@ -31,7 +30,6 @@
 #include "messagecore/settings/globalsettings.h"
 #include <Sonnet/ConfigDialog>
 
-
 KMComposerEditorNg::KMComposerEditorNg(KMComposeWin *win, QWidget *parent)
     : MessageComposer::RichTextComposer(parent),
       mComposerWin(win)
diff --git a/editor/kmcomposereditorng.h b/editor/kmcomposereditorng.h
index c92f386fd..8637fd7c8 100644
--- a/editor/kmcomposereditorng.h
+++ b/editor/kmcomposereditorng.h
@@ -15,13 +15,13 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-
 #ifndef KMCOMPOSEREDITORNG_H
 #define KMCOMPOSEREDITORNG_H
 
 #include "messagecomposer/composer-ng/richtextcomposer.h"
 class KMComposeWin;
-namespace KPIMTextEdit {
+namespace KPIMTextEdit
+{
 class EMailQuoteHighlighter;
 }
 
diff --git a/editor/kmcomposereditorwidgetng.h b/editor/kmcomposereditorwidgetng.h
index 12728ed0e..5a4585b8c 100644
--- a/editor/kmcomposereditorwidgetng.h
+++ b/editor/kmcomposereditorwidgetng.h
@@ -15,12 +15,12 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-
 #ifndef KMCOMPOSEREDITORWIDGETNG_H
 #define KMCOMPOSEREDITORWIDGETNG_H
 
 #include <texteditor/richtexteditor/richtexteditorwidget.h>
-namespace PimCommon {
+namespace PimCommon
+{
 class RichTextEditor;
 }
 class KMComposerEditorWidgetNg : public PimCommon::RichTextEditorWidget
diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp
index 113bcbbeb..48d7091c7 100644
--- a/editor/kmcomposewin.cpp
+++ b/editor/kmcomposewin.cpp
@@ -2095,7 +2095,6 @@ QUrl KMComposeWin::insertFile()
     return url;
 }
 
-
 QString KMComposeWin::smartQuote(const QString &msg)
 {
     return MessageCore::StringUtil::smartQuote(msg, MessageComposer::MessageComposerSettings::self()->lineWrapWidth());
diff --git a/kmcommands.cpp b/kmcommands.cpp
index c5ca61269..db7b50b27 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -546,7 +546,7 @@ KMCommand::Result KMEditMessageCommand::execute()
     bool lastEncrypt = false;
     bool lastSign = false;
     KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, mMessage);
-    win->setMessage( mMessage, lastSign, lastEncrypt, false, true );
+    win->setMessage(mMessage, lastSign, lastEncrypt, false, true);
     win->show();
     win->setModified(true);
     return OK;
@@ -586,7 +586,7 @@ KMCommand::Result KMEditItemCommand::execute()
     bool lastEncrypt = false;
     bool lastSign = false;
     KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg);
-    win->setMessage( msg, lastSign, lastEncrypt, false, true );
+    win->setMessage(msg, lastSign, lastEncrypt, false, true);
 
     win->setFolder(item.parentCollection());
 
@@ -1598,7 +1598,7 @@ KMCommand::Result KMResendMessageCommand::execute()
     bool lastEncrypt = false;
     bool lastSign = false;
     KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg);
-    win->setMessage( newMsg, lastSign, lastEncrypt, false, true );
+    win->setMessage(newMsg, lastSign, lastEncrypt, false, true);
 
     win->show();