diff --git a/src/configuredialog/configuresecuritypage.cpp b/src/configuredialog/configuresecuritypage.cpp
index 351f7a2a3..90370cb10 100644
--- a/src/configuredialog/configuresecuritypage.cpp
+++ b/src/configuredialog/configuresecuritypage.cpp
@@ -92,6 +92,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab(QWidget *parent)
 
     connect(mSGTab.mScamDetection, &QAbstractButton::toggled, this, &ConfigModuleTab::slotEmitChanged);
 
+    connect(mSGTab.mCheckUrl, &QCheckBox::stateChanged, this, &SecurityPageGeneralTab::slotEmitChanged);
     connect(mSGTab.scamWhiteList, &PimCommon::SimpleStringListEditor::changed, this, &ConfigModuleTab::slotEmitChanged);
     mSGTab.scamWhiteList->setAddDialogLabel(i18n("Email Address:"));
 }
@@ -114,6 +115,7 @@ void SecurityPage::GeneralTab::doLoadOther()
 
     loadWidget(mSGTab.mScamDetection, MessageViewer::MessageViewerSettings::self()->scamDetectionEnabledItem());
     loadWidget(mSGTab.scamWhiteList, MessageViewer::MessageViewerSettings::self()->scamDetectionWhiteListItem());
+    loadWidget(mSGTab.mCheckUrl, MessageViewer::MessageViewerSettings::self()->checkPhishingUrlItem());
 }
 
 void SecurityPage::GeneralTab::save()
@@ -140,6 +142,7 @@ void SecurityPage::GeneralTab::save()
     saveCheckBox(mSGTab.mAlwaysDecrypt, MessageViewer::MessageViewerSettings::self()->alwaysDecryptItem());
     saveCheckBox(mSGTab.mScamDetection, MessageViewer::MessageViewerSettings::self()->scamDetectionEnabledItem());
     saveSimpleStringListEditor(mSGTab.scamWhiteList, MessageViewer::MessageViewerSettings::self()->scamDetectionWhiteListItem());
+    saveCheckBox(mSGTab.mCheckUrl, MessageViewer::MessageViewerSettings::self()->checkPhishingUrlItem());
 }
 
 QString SecurityPage::MDNTab::helpAnchor() const
diff --git a/src/ui/securitypagegeneraltab.ui b/src/ui/securitypagegeneraltab.ui
index 3acf4251f..d4a1c1f90 100644
--- a/src/ui/securitypagegeneraltab.ui
+++ b/src/ui/securitypagegeneraltab.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>757</width>
-    <height>508</height>
+    <width>818</width>
+    <height>602</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -104,7 +104,7 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -126,7 +126,7 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <widget class="QGroupBox" name="groupBox_4">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -148,6 +148,22 @@
      </layout>
     </widget>
    </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox_5">
+     <property name="title">
+      <string>Safe Browsing</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="mCheckUrl">
+        <property name="text">
+         <string>Check Url</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>