diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index cf1ec0261..547e7e511 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -9,6 +9,7 @@ Fixed:
 
 Added:
 <ul>
+<li>Layout orientation of message list/viewer is now changeable via "View" menu (bug report #98).</li>
 <li>Sort order/column in message list is now persistent (bug #97).</li>
 <li>Inline searching in feed/message list is now case insensitive and more polished (bug report #84).</li>
 <li>Items in feed list (categories and feeds) now can be re-arranged via drag-drop functionality (issue report #91).</li>
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 193fc03b7..e703c1dca 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -133,6 +133,15 @@ void FeedMessageViewer::quit() {
   }
 }
 
+void FeedMessageViewer::switchMessageSplitterOrientation() {
+  if (m_messageSplitter->orientation() == Qt::Vertical) {
+    m_messageSplitter->setOrientation(Qt::Horizontal);
+  }
+  else {
+    m_messageSplitter->setOrientation(Qt::Vertical);
+  }
+}
+
 void FeedMessageViewer::setToolBarsEnabled(bool enable) {
   m_toolBarsEnabled = enable;
   m_toolBarFeeds->setVisible(enable);
@@ -277,6 +286,8 @@ void FeedMessageViewer::createConnections() {
           SIGNAL(triggered()), m_messagesView, SLOT(selectPreviousItem()));
   connect(form_main->m_ui->m_actionDefragmentDatabase,
           SIGNAL(triggered()), this, SLOT(vacuumDatabase()));
+  connect(form_main->m_ui->m_actionSwitchMessageListOrientation, SIGNAL(triggered()),
+          this, SLOT(switchMessageSplitterOrientation()));
 }
 
 void FeedMessageViewer::initialize() {
@@ -354,7 +365,6 @@ void FeedMessageViewer::initializeViews() {
   setTabOrder(m_messagesView, m_toolBarFeeds);
   setTabOrder(m_toolBarFeeds, m_toolBarMessages);
   setTabOrder(m_toolBarMessages, m_messagesBrowser);
-
 }
 
 void FeedMessageViewer::vacuumDatabase() {
diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h
index d5001b224..bbb524ba0 100644
--- a/src/gui/feedmessageviewer.h
+++ b/src/gui/feedmessageviewer.h
@@ -83,6 +83,8 @@ class FeedMessageViewer : public TabContent {
     }
 
   public slots:
+    void switchMessageSplitterOrientation();
+
     // Enables/disables main toolbars or list headers.
     void setToolBarsEnabled(bool enable);
     void setListHeadersEnabled(bool enable);
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index 88e8d354c..599624aaf 100755
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -91,6 +91,7 @@
     </widget>
     <addaction name="m_menuShowHide"/>
     <addaction name="m_actionSwitchMainWindow"/>
+    <addaction name="m_actionSwitchMessageListOrientation"/>
    </widget>
    <widget class="QMenu" name="m_menuTools">
     <property name="title">
@@ -628,6 +629,14 @@
     <string>&amp;Backup database/settings</string>
    </property>
   </action>
+  <action name="m_actionSwitchMessageListOrientation">
+   <property name="text">
+    <string>Switch message list layout orientation</string>
+   </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 570b595d7..f55ad7522 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -236,15 +236,11 @@ void MessagesView::selectionChanged(const QItemSelection &selected,
 void MessagesView::loadFeeds(const QList<int> &feed_ids) {
   m_sourceModel->loadMessages(feed_ids);
 
-  // Make sure that initial sorting is that unread messages are visible
-  // first.
-  // TODO: pokračovat, při stortovani uložit column a order
   int col = qApp->settings()->value(APP_CFG_GUI, "default_sort_column_messages", MSG_DB_DCREATED_INDEX).toInt();
   Qt::SortOrder ord = static_cast<Qt::SortOrder>(qApp->settings()->value(APP_CFG_GUI,
                                                                          "default_sort_order_messages", Qt::DescendingOrder).toInt());
 
-  sortByColumn(col,
-               ord);
+  sortByColumn(col, ord);
 
   // Messages are loaded, make sure that previously
   // active message is not shown in browser.