diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6f9f8da..c38095d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,6 @@
 # The methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
+  include NavigationHelper
   
   protected 
 
diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb
new file mode 100644
index 0000000..757bec8
--- /dev/null
+++ b/app/helpers/navigation_helper.rb
@@ -0,0 +1,34 @@
+module NavigationHelper
+  def link_back_to_messages
+    link_to("&#171;" << _('Back to messages'), :controller=>"webmail", :action=>"messages")
+  end
+
+  def link_send_mail
+    link_to(_('Compose'), :controller=>"webmail", :action=>"compose")
+  end
+
+  def link_mail_prefs
+    link_to(_('Preferences'), :controller=>"webmail", :action=>"prefs")
+  end
+
+  def link_mail_filters
+    link_to(_('Filters'), :controller=>"webmail", :action=>"filters")
+  end
+
+  def folder_manage_link(folder)
+    if folder.name == CDF::CONFIG[:mail_trash] or folder.name == CDF::CONFIG[:mail_inbox] or folder.name == CDF::CONFIG[:mail_sent]
+      short_fn(folder)
+    else
+      return short_fn(folder) +
+      ("&nbsp;" + link_to(_('(Delete)'), :controller=>"webmail", :action=>"manage_folders", :params=>{"op"=>_('(Delete)'), "folder_name"=>folder.name}))
+    end  
+  end
+
+  def short_fn(folder)
+    if folder.name.include? folder.delim
+      "&nbsp; &nbsp;" + folder.name.split(folder.delim).last
+    else
+      folder.name
+    end
+  end
+end
diff --git a/app/helpers/webmail_helper.rb b/app/helpers/webmail_helper.rb
index 2f287d4..a0725a5 100644
--- a/app/helpers/webmail_helper.rb
+++ b/app/helpers/webmail_helper.rb
@@ -7,10 +7,6 @@ module WebmailHelper
     link_to(_('Folders'), :controller=>"webmail", :action=>"messages")
   end
   
-  def link_send_mail
-    link_to(_('Compose'), :controller=>"webmail", :action=>"compose")
-  end
-
   def link_compose_new
     link_to(_('Compose new mail'), :controller=>"webmail", :action=>"compose")
   end
@@ -43,18 +39,6 @@ module WebmailHelper
     link_to(_('add/edit'), :controller=>"webmail", :action=>"manage_folders")
   end
 
-  def link_back_to_messages
-    link_to("&#171;" << _('Back to messages'), :controller=>"webmail", :action=>"messages")
-  end
-  
-  def link_mail_prefs
-    link_to(_('Preferences'), :controller=>"webmail", :action=>"prefs")
-  end
-  
-  def link_mail_filters
-    link_to(_('Filters'), :controller=>"webmail", :action=>"filters")
-  end
-
   def link_filter_add
     link_to(_('Add filter'), :controller=>'webmail', :action=>'filter_add')
   end
@@ -81,22 +65,7 @@ module WebmailHelper
     end  
   end
   
-  def short_fn(folder)
-    if folder.name.include? folder.delim
-      "&nbsp; &nbsp;" + folder.name.split(folder.delim).last
-    else
-      folder.name
-    end
-  end
   
-  def folder_manage_link(folder)
-    if folder.name == CDF::CONFIG[:mail_trash] or folder.name == CDF::CONFIG[:mail_inbox] or folder.name == CDF::CONFIG[:mail_sent]
-      short_fn(folder)
-    else
-      return short_fn(folder) +
-      ("&nbsp;" + link_to(_('(Delete)'), :controller=>"webmail", :action=>"manage_folders", :params=>{"op"=>_('(Delete)'), "folder_name"=>folder.name}))
-    end  
-  end
   
   def message_date(datestr)
     t = Time.now