diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index 2bff3a2fd..e4f75d6b6 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -17,7 +17,7 @@
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -51,8 +51,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>100</width>
-            <height>30</height>
+            <width>576</width>
+            <height>373</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -102,8 +102,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>568</width>
-                <height>344</height>
+                <width>177</width>
+                <height>213</height>
                </rect>
               </property>
               <layout class="QFormLayout" name="formLayout">
@@ -565,7 +565,7 @@
        <item>
         <widget class="QTabWidget" name="m_tabFeedsMessages">
          <property name="currentIndex">
-          <number>1</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="m_tabFeeds">
           <attribute name="title">
@@ -576,16 +576,13 @@
           <attribute name="title">
            <string>Messages</string>
           </attribute>
-          <layout class="QFormLayout" name="formLayout_10">
-           <property name="fieldGrowthPolicy">
-            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-           </property>
+          <layout class="QFormLayout" name="formLayout_11">
            <item row="0" column="0" colspan="2">
             <widget class="QGroupBox" name="groupBox_3">
              <property name="title">
               <string>External web browser for message viewing</string>
              </property>
-             <layout class="QFormLayout" name="formLayout_11">
+             <layout class="QFormLayout" name="formLayout_10">
               <item row="0" column="0">
                <widget class="QLabel" name="m_lblExternalBrowserExecutable">
                 <property name="text">
@@ -619,36 +616,32 @@
                </widget>
               </item>
               <item row="1" column="1">
-               <layout class="QHBoxLayout" name="horizontalLayout_11">
-                <item>
-                 <widget class="QLineEdit" name="m_txtExternalBrowserArguments">
-                  <property name="placeholderText">
-                   <string>Parameters to executable</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="m_lblExternalBrowserPreset">
-                  <property name="text">
-                   <string>use sample arguments for</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QComboBox" name="m_cmbExternalBrowserPreset">
-                  <property name="sizeAdjustPolicy">
-                   <enum>QComboBox::AdjustToContents</enum>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>select browser</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-               </layout>
+               <widget class="QLineEdit" name="m_txtExternalBrowserArguments">
+                <property name="placeholderText">
+                 <string>Parameters to executable</string>
+                </property>
+               </widget>
               </item>
-              <item row="2" column="0" colspan="2">
+              <item row="2" column="0">
+               <widget class="QLabel" name="m_lblExternalBrowserPreset">
+                <property name="text">
+                 <string>use sample arguments for</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QComboBox" name="m_cmbExternalBrowserPreset">
+                <property name="sizeAdjustPolicy">
+                 <enum>QComboBox::AdjustToContents</enum>
+                </property>
+                <item>
+                 <property name="text">
+                  <string>select browser</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item row="3" column="0" colspan="2">
                <widget class="QLabel" name="label">
                 <property name="text">
                  <string>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</string>
@@ -662,6 +655,8 @@
             </widget>
            </item>
           </layout>
+          <zorder>groupBox_3</zorder>
+          <zorder>label</zorder>
          </widget>
         </widget>
        </item>
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 0981c49b0..c647e128d 100644
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -214,10 +214,10 @@ void MessagesView::loadFeeds(const QList<int> &feed_ids) {
 
 void MessagesView::openSelectedSourceArticlesExternally() {
   QString browser = Settings::instance()->value(APP_CFG_MESSAGES,
-                                                   "external_browser_executable").toString();
-  QString arguments = Settings::instance()->value(APP_CFG_MESSAGES,
-                                                     "external_browser_arguments",
-                                                     "%1").toString();
+                                                "external_browser_executable").toString();
+  QStringList arguments = Settings::instance()->value(APP_CFG_MESSAGES,
+                                                      "external_browser_arguments",
+                                                      "%1").toString().split(' ');
 
   if (browser.isEmpty() || arguments.isEmpty()) {
     QMessageBox::critical(this,
@@ -229,12 +229,14 @@ void MessagesView::openSelectedSourceArticlesExternally() {
 
   foreach (const QModelIndex &index, selectionModel()->selectedRows()) {
     QString link = m_sourceModel->messageAt(m_proxyModel->mapToSource(index).row()).m_url;
+    QStringList real_arguments = arguments.replaceInStrings("%1", link);
 
-    if (!QProcess::startDetached(browser, QStringList() << arguments.arg(link))) {
+    if (!QProcess::startDetached(browser, real_arguments)) {
       QMessageBox::critical(this,
                             tr("Problem with starting external web browser"),
                             tr("External web browser could not be started."),
                             QMessageBox::Ok);
+      return;
     }
   }
 }