diff --git a/app/views/webmail/error_connection.rhtml b/app/views/webmail/error_connection.rhtml
index dbdcefc..ee08a7b 100644
--- a/app/views/webmail/error_connection.rhtml
+++ b/app/views/webmail/error_connection.rhtml
@@ -17,8 +17,6 @@
 
 <% content_for('sidebar') { %>  
 <div id="folders">
-  <h4><%=_('Folders')%><br/><%=link_manage_folders%></h4>
-  <hr/>
   <%=_('Error occured obtaining connection to mail server. Please excuse us!')%>
 </div>
 <% } %>
diff --git a/app/views/webmail/folders.rhtml b/app/views/webmail/folders.rhtml
index 0356db2..60ef805 100644
--- a/app/views/webmail/folders.rhtml
+++ b/app/views/webmail/folders.rhtml
@@ -16,17 +16,11 @@
 <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>
+  <%= render :partial => 'shared' %>
 <% } %>
 <div id="messages">
-<% if not(@request['msg_id'] == '') %>
-<%= render_component(:controller => "webmail/webmail", :action => "message", :params => { 'msg_id' => @request['msg_id']})%>
+<% if not(request['msg_id'] == '') %>
+<%= render_component(:controller => "webmail/webmail", :action => "message", :params => { 'msg_id' => request['msg_id']})%>
 <% else %>
 <%= render_component(:controller => "webmail/webmail", :action => "messages") %>
 <% end %>
diff --git a/app/views/webmail/message.rhtml b/app/views/webmail/message.rhtml
index 58131f6..05b0be8 100644
--- a/app/views/webmail/message.rhtml
+++ b/app/views/webmail/message.rhtml
@@ -16,13 +16,7 @@
 <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>
+  <%= render :partial => 'shared/folders' %>
 <% } %>
 <div id="messages">