diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb
index b58f42f..43a7549 100644
--- a/app/helpers/navigation_helper.rb
+++ b/app/helpers/navigation_helper.rb
@@ -1,6 +1,6 @@
 module NavigationHelper
   def link_back_to_messages
-    link_to("&#171;" << _('Back to messages'), :controller=>"webmail", :action=>"messages")
+    link_to("&#171;" << t(:back_to_message), :controller=>"webmail", :action=>"messages")
   end
 
   def link_send_mail
@@ -19,7 +19,7 @@ module NavigationHelper
     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
-      short_fn(folder) + '&nbsp;' + link_to(_('Delete'), folder_path(folder.name), :method => :delete)
+      short_fn(folder) + '&nbsp;' + link_to(t(:delete), folder_path(folder.name), :method => :delete)
     end  
   end
 
diff --git a/app/views/folders/index.html.erb b/app/views/folders/index.html.erb
index 748883a..599cbe8 100644
--- a/app/views/folders/index.html.erb
+++ b/app/views/folders/index.html.erb
@@ -1,7 +1,7 @@
-<h1><%=_('Mailbox')%></h1>
+<h1><%=t :mailbox %></h1>
 <div id="header">
   <ul id="primary">
-    <li><span><%= _('Folders') %></span>
+    <li><span><%= t :folders %></span>
       <ul id="secondary">
           <li><%=link_back_to_messages%></li>
       </ul>
@@ -17,13 +17,13 @@
 
 <% content_for('sidebar') { %>  
 <div id="folders">
-  <h4><%=_('Add folder')%></h4>
+  <h4><%= t :add_folder %></h4>
   <hr/>
   <% form_tag folders_path, :id => 'new_folder' do %>
     <ul>
-      <li><label for='folder'><%=_('Name')%>:</label></li>
+      <li><label for='folder'><%= t :name %>:</label></li>
       <li><%= text_field_tag 'folder', '', :size => 18 %></li>
-      <li><%= submit_tag _('Add folder') %></li>
+      <li><%= submit_tag t(:add_folder) %></li>
     </ul>
   <% end %>
 </div>    
@@ -32,7 +32,7 @@
 <div id="messages">
   <div id='msg-fl-list'>
   <table>
-    <thead><tr><th><%=_('Folder')%></th><th><%= _('Total messages') %></th><th><%= _('Unseen') %></th></tr></thead>
+    <thead><tr><th><%= t :folder %></th><th><%= t :total_messages %></th><th><%= t :unseen%></th></tr></thead>
     <tbody>
   <% for folder in @folders %>
     <tr>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8355bff..57f3a7a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,6 +6,7 @@ en:
   wrong_email_or_password:  Wrong email or password specified.
   mailbox:        Mailbox
   folders:        Folders
+  folder:         Folder
   empty:          Empty
   logout:         Logout
   compose:        Compose
@@ -60,4 +61,6 @@ en:
   add_one_contact:  Add one contact
   add_multiple:   Add multiple 
   name:           name
-
+  add_folder:     Add folder
+  total_messages: Total messages
+  unseen:         Unseen
diff --git a/lib/webmail/cdfmail.rb b/lib/webmail/cdfmail.rb
index 427ad92..b3cbe73 100644
--- a/lib/webmail/cdfmail.rb
+++ b/lib/webmail/cdfmail.rb
@@ -2,6 +2,9 @@ require 'tmail'
 require 'net/smtp'
 require 'mail_transform'
 
+module CDF
+end
+
 class CDF::Mail
 	include ActionMailer::Quoting