diff --git a/.gitignore b/.gitignore
index ea9db41..6d57af1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ config/database.yml
 .*.sw?
 config/site.rb
 tmp
+mail_temp
diff --git a/app/controllers/webmail_controller.rb b/app/controllers/webmail_controller.rb
index 4e10da9..236945f 100644
--- a/app/controllers/webmail_controller.rb
+++ b/app/controllers/webmail_controller.rb
@@ -124,7 +124,7 @@ class WebmailController < ApplicationController
     @mail = prepare_mail
     @mail.reply(@tmail, fb, get_mail_prefs.mail_type)
     
-    render_action("compose")
+    render :action => 'compose'
   end
   
   def forward
@@ -136,7 +136,7 @@ class WebmailController < ApplicationController
     @mail = prepare_mail
     @mail.forward(@tmail, fb)
     
-    render_action("compose")
+    render :action => 'compose'
   end
   
   def compose
diff --git a/app/views/webmail/message.rhtml b/app/views/webmail/message.rhtml
index 97d957f..58131f6 100644
--- a/app/views/webmail/message.rhtml
+++ b/app/views/webmail/message.rhtml
@@ -30,7 +30,7 @@
   <div id="topmenu">
     <ul class="actionmenu">
       <li>
-      <%= link_to(_("&#171; Back to list"), :controller=>"/webmail/webmail", :action=>"messages") %>
+      <%= link_to(_("&#171; Back to list"), :controller=>"webmail", :action=>"messages") %>
       </li>
       <li><%=link_reply_to_sender(@msg_id)%></li>
       <li><%=link_forward_message(@msg_id)%></li>
diff --git a/components/webmail/cdfmail.rb b/components/webmail/cdfmail.rb
index 13a938e..427ad92 100644
--- a/components/webmail/cdfmail.rb
+++ b/components/webmail/cdfmail.rb
@@ -140,13 +140,13 @@ class CDF::Mail
   end
     
   def reply(tmail, fb, type)
-		decoded_subject = mime_encoded?(tmail.subject) ? mime_decode(tmail.subject) : tmail.subject
-    self.subject = "[Re: #{decoded_subject}]"
-    tm = tmail.setup_reply(tmail)
-		self.to = tm.to
-		footer = ""
-		msg_id = ""
-		mt = MailTransform.new
+    decoded_subject = mime_encoded?(tmail.subject) ? mime_decode(tmail.subject) : tmail.subject
+    self.subject = "Re: #{decoded_subject}"
+    tm = tmail.create_reply
+    self.to = tm.to
+    footer = ""
+    msg_id = ""
+    mt = MailTransform.new
     self.body = mt.get_body(tmail, type)
   end