diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index 0736f80..2bd1e8c 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -143,7 +143,21 @@ public class MainWindow : Gtk.ApplicationWindow {
             provider.load_from_data("""
                 GtkBox GtkHeaderBar {
                     border-radius: 0px;
+                }
+
+                .folder_paned{
+                    background-color:@sidebar_bg
+                }
+
+                .conversation_frame{
+                    border-top-width: 0px;
+                    border-bottom-width: 0px;
+                }
+
+                .conversations_paned{
+                    background-color:#ccc
                 }""", -1);
+
         } catch (Error error) {
             debug("Could not load styling from data: %s", error.message);
         }
@@ -157,9 +171,6 @@ public class MainWindow : Gtk.ApplicationWindow {
         folder_list_scrolled.set_size_request(FOLDER_LIST_WIDTH, -1);
         folder_list_scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         folder_list_scrolled.add(folder_list);
-        Gtk.Frame folder_frame = new Gtk.Frame(null);
-        folder_frame.shadow_type = Gtk.ShadowType.IN;
-        folder_frame.add(folder_list_scrolled);
         
         // message list
         conversation_list_scrolled = new Gtk.ScrolledWindow(null, null);
@@ -169,6 +180,7 @@ public class MainWindow : Gtk.ApplicationWindow {
         Gtk.Frame conversation_frame = new Gtk.Frame(null);
         conversation_frame.shadow_type = Gtk.ShadowType.IN;
         conversation_frame.add(conversation_list_scrolled);
+        conversation_frame.get_style_context().add_class("conversation_frame");
         
         // Three-pane display.
         Gtk.Box status_bar_box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
@@ -176,19 +188,17 @@ public class MainWindow : Gtk.ApplicationWindow {
         status_bar.set_border_width(2);
         spinner.set_size_request(STATUS_BAR_HEIGHT - 2, -1);
         status_bar.add(spinner);
-        status_bar_box.pack_start(folder_frame);
+        status_bar_box.pack_start(folder_list_scrolled);
         status_bar_box.pack_start(status_bar, false, false, 0);
         status_bar_box.get_style_context().add_class(Gtk.STYLE_CLASS_SIDEBAR);
         
         folder_paned.get_style_context().add_class("sidebar-pane-separator");
-        
-        Gtk.Frame viewer_frame = new Gtk.Frame(null);
-        viewer_frame.shadow_type = Gtk.ShadowType.NONE;
-        viewer_frame.add(conversation_viewer);
+        folder_paned.get_style_context().add_class("folder_paned");
         
          // Message list left of message viewer.
         conversations_paned.pack1(conversation_frame, false, false);
-        conversations_paned.pack2(viewer_frame, true, true);
+        conversations_paned.pack2(conversation_viewer, true, true);
+        conversations_paned.get_style_context().add_class("conversations_paned");
         
         // Folder list to the left of everything.
         folder_paned.pack1(status_bar_box, false, false);
