diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3de16754..c199cbb9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -86,7 +86,7 @@ set(keepassx_SOURCES
     gui/FileDialog.cpp
     gui/IconModels.cpp
     gui/KeePass1OpenWidget.cpp
-    gui/kmessagewidget.cpp
+    gui/KMessageWidget.cpp
     gui/LineEdit.cpp
     gui/MainWindow.cpp
     gui/MessageBox.cpp
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index fcfff5ca..ba395b59 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -158,12 +158,11 @@ void EditWidgetIcons::fetchFavicon(QUrl url)
 
 void EditWidgetIcons::fetchFaviconFromGoogle(QString domain)
 {
-     if (m_fallbackToGoogle) {
+    if (m_fallbackToGoogle) {
         abortFaviconDownload();
         m_fallbackToGoogle = false;
         fetchFavicon(QUrl("http://www.google.com/s2/favicons?domain=" + domain));
-    }
-    else {
+    } else {
         abortFaviconDownload();
         MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
     }
diff --git a/src/gui/kmessagewidget.cpp b/src/gui/KMessageWidget.cpp
similarity index 99%
rename from src/gui/kmessagewidget.cpp
rename to src/gui/KMessageWidget.cpp
index ee3c1b69..f2c48c25 100644
--- a/src/gui/kmessagewidget.cpp
+++ b/src/gui/KMessageWidget.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kmessagewidget.h"
+#include "KMessageWidget.h"
 
 #include <QAction>
 #include <QEvent>
@@ -477,4 +477,4 @@ void KMessageWidget::setIcon(const QIcon &icon)
     }
 }
 
-#include "moc_kmessagewidget.cpp"
+#include "moc_KMessageWidget.cpp"
diff --git a/src/gui/kmessagewidget.h b/src/gui/KMessageWidget.h
similarity index 100%
rename from src/gui/kmessagewidget.h
rename to src/gui/KMessageWidget.h
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 63bc1ba8..b9da4e19 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -802,9 +802,7 @@ void MainWindow::displayGlobalMessage(const QString& text, MessageWidget::Messag
 
 void MainWindow::displayTabMessage(const QString& text, MessageWidget::MessageType type)
 {
-    //if (m_ui->stackedWidget->currentIndex() == 0) {
-        m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type);
-    //}
+    m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type);
 }
 
 void MainWindow::hideGlobalMessage()
diff --git a/src/gui/MessageWidget.h b/src/gui/MessageWidget.h
index 0e7d8a30..34c06743 100644
--- a/src/gui/MessageWidget.h
+++ b/src/gui/MessageWidget.h
@@ -18,7 +18,7 @@
 #ifndef MESSAGEWIDGET_H
 #define MESSAGEWIDGET_H
 
-#include "gui/kmessagewidget.h"
+#include "gui/KMessageWidget.h"
 
 class MessageWidget : public KMessageWidget
 {