diff --git a/app/controllers/webmail_controller.rb b/app/controllers/webmail_controller.rb
index cb6954b..4e10da9 100644
--- a/app/controllers/webmail_controller.rb
+++ b/app/controllers/webmail_controller.rb
@@ -350,7 +350,7 @@ class WebmailController < ApplicationController
   end
   
   def load_imap_session
-    return if ['compose', 'prefs', 'error_connection'].include?(action_name)
+    return if ['error_connection'].include?(action_name)
     get_imap_session
   end
   
@@ -375,7 +375,7 @@ class WebmailController < ApplicationController
   
   def have_to_load_folders?
     return true if ['messages', 'delete', 'reply', 'forward', 'empty', 'message', 'download',
-                 'filter', 'filter_add', 'view_source'].include?(action_name)
+                 'filter', 'filter_add', 'view_source', 'compose', 'prefs', 'filters'].include?(action_name)
     return false
   end
   
diff --git a/app/views/layouts/public.rhtml b/app/views/layouts/public.rhtml
index a7bf860..1c0957e 100644
--- a/app/views/layouts/public.rhtml
+++ b/app/views/layouts/public.rhtml
@@ -15,9 +15,9 @@
   <div id="wholepage">
     <div id="container">
       <div id="sidebar_outer">
-	<div id="sidebar"><%= @content_for_sidebar %></div>
+	<div id="sidebar"><%= yield :sidebar %></div>
       </div>
-      <div id="content"><%= @content_for_layout %></div>
+      <div id="content"><%= yield %></div>
       <br class="clear"/>
     </div>
   </div>
diff --git a/app/views/shared/_folders.html.erb b/app/views/shared/_folders.html.erb
new file mode 100644
index 0000000..000a1ac
--- /dev/null
+++ b/app/views/shared/_folders.html.erb
@@ -0,0 +1,10 @@
+<div id="folders">
+  <h4><%=_('Folders')%><br/><%=link_manage_folders%></h4>
+  <hr/>
+  <ul> <% for folder in @folders %>
+    <li><%=folder_link(folder)%></li> <% end %> 
+  </ul>
+</div>
+<div style="text-align: center; padding: 10px;">
+  <input type="button" value="<%= _('Logout')%>" onclick="window.location='/login/logout'">
+</div>
diff --git a/app/views/webmail/compose.rhtml b/app/views/webmail/compose.rhtml
index 4f23c75..a850c16 100644
--- a/app/views/webmail/compose.rhtml
+++ b/app/views/webmail/compose.rhtml
@@ -1,3 +1,7 @@
+<% content_for('sidebar') { %>
+  <%= render :partial => 'shared/folders' %>
+<% } %>
+
 <h1><%=_('Mailbox')%></h1>
 <form name="composeMail" id='composeMail' action="/webmail/compose"  enctype="multipart/form-data" method="post">
 <div id="header">
diff --git a/app/views/webmail/filters.rhtml b/app/views/webmail/filters.rhtml
index 92e5189..a729e10 100644
--- a/app/views/webmail/filters.rhtml
+++ b/app/views/webmail/filters.rhtml
@@ -1,3 +1,6 @@
+<% content_for('sidebar') { %>
+  <%= render :partial => 'shared/folders' %>
+<% } %>
 <h1><%=_('Mailbox')%></h1>
 <div id="header">
   <ul id="primary">
diff --git a/app/views/webmail/messages.rhtml b/app/views/webmail/messages.rhtml
index 83f3c82..1e20507 100644
--- a/app/views/webmail/messages.rhtml
+++ b/app/views/webmail/messages.rhtml
@@ -15,17 +15,8 @@
 <div id="tab_main">
 <div id="tab_content">
 
-<% content_for('sidebar') { %>  
-<div id="folders">
-  <h4><%=_('Folders')%><br/><%=link_manage_folders%></h4>
-  <hr/>
-  <ul> <% for folder in @folders %>
-    <li><%=folder_link(folder)%></li> <% end %> 
-  </ul>
-</div>
-<div style="text-align: center; padding: 10px;">
-  <input type="button" value="<%= _('Logout')%>" onclick="window.location='/login/logout'">
-</div>
+<% content_for('sidebar') { %>
+  <%= render :partial => 'shared/folders' %>
 <% } %>
 
 <div id="messages">
diff --git a/app/views/webmail/prefs.rhtml b/app/views/webmail/prefs.rhtml
index 7f58a5a..7f305a3 100644
--- a/app/views/webmail/prefs.rhtml
+++ b/app/views/webmail/prefs.rhtml
@@ -1,3 +1,6 @@
+<% content_for('sidebar') { %>
+  <%= render :partial => 'shared/folders' %>
+<% } %>
 <h1><%=_('Mailbox')%></h1>
 <div id="header">
   <ul id="primary">