diff --git a/src/.clang-format b/src/.clang-format
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -1,13 +1,14 @@
-Language:        Cpp
-Standard:        Cpp11
-ColumnLimit:     80
-IndentWidth:     4
-TabWidth:        4
-UseTab:          Never
+Language:             Cpp
+Standard:             Cpp11
+ColumnLimit:          80
+IndentWidth:          4
+TabWidth:             4
 AccessModifierOffset: -4
-IndentCaseLabels: true
+UseTab:               Never
+IndentCaseLabels:     true
 NamespaceIndentation: Inner
-BreakBeforeBraces: Attach
+BreakBeforeBraces:    Attach
+ReflowComments:       true
 AllowShortIfStatementsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: Inline
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, BOOST_REVERSE_FOREACH ]
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -126,7 +126,7 @@
     connect(ui->treeWidget, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this,
             SLOT(viewItemChanged(QTreeWidgetItem *, int)));
 
-// click on header
+    // click on header
     ui->treeWidget->header()->setSectionsClickable(true);
     connect(ui->treeWidget->header(), SIGNAL(sectionClicked(int)), this,
             SLOT(headerSectionClicked(int)));
@@ -431,8 +431,9 @@
         }
     }
 
-// TODO: Remove this temporary qt5 fix after Qt5.3 and Qt5.4 are no longer used.
-//       Fixed in Qt5.5 and above: https://bugreports.qt.io/browse/QTBUG-43473
+    // TODO: Remove this temporary qt5 fix after Qt5.3 and Qt5.4 are no longer
+    // used.
+    // Fixed in Qt5.5 and above: https://bugreports.qt.io/browse/QTBUG-43473
     else if (column == COLUMN_CHECKBOX && item->childCount() > 0) {
         if (item->checkState(COLUMN_CHECKBOX) == Qt::PartiallyChecked &&
             item->child(0)->checkState(COLUMN_CHECKBOX) ==
diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp
--- a/src/qt/networkstyle.cpp
+++ b/src/qt/networkstyle.cpp
@@ -65,7 +65,7 @@
             }
         }
 
-// convert back to QPixmap
+        // convert back to QPixmap
         pixmap.convertFromImage(img);
     }
 
diff --git a/src/qt/notificator.h b/src/qt/notificator.h
--- a/src/qt/notificator.h
+++ b/src/qt/notificator.h
@@ -58,8 +58,8 @@
     enum Mode {
         None, /**< Ignore informational notifications, and show a modal pop-up
                  dialog for Critical notifications. */
-        Freedesktop, /**< Use DBus org.freedesktop.Notifications */
-        QSystemTray, /**< Use QSystemTray::showMessage */
+        Freedesktop,           /**< Use DBus org.freedesktop.Notifications */
+        QSystemTray,           /**< Use QSystemTray::showMessage */
         UserNotificationCenter /**< Use the 10.8+ User Notification Center (Mac
                                   only) */
     };