From a997c9d97a39e2f510bb1e444e3a28b0ded4d570 Mon Sep 17 00:00:00 2001
From: Eugene Korbut <me@mvl.ru>
Date: Sun, 8 Feb 2009 05:24:23 +1000
Subject: [PATCH] copy and move operations from messages page

---
 app/views/webmail/messages.rhtml  | 2 +-
 components/webmail/imapmailbox.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/webmail/messages.rhtml b/app/views/webmail/messages.rhtml
index 1e20507..4403fbb 100644
--- a/app/views/webmail/messages.rhtml
+++ b/app/views/webmail/messages.rhtml
@@ -22,7 +22,7 @@
 <div id="messages">
   <div id="msglist">
     <h2><%= @folder_name %></h2>
-    <%= form_tag({:controller=>'/webmail/webmail', :action=>'messages'})%>
+    <%= form_tag({:controller=>'webmail', :action=>'messages'})%>
     <div class='notviscode'><input type="submit" name="op" value="<%=_('Search')%>" /></div>
     <input type="hidden" name="page" value="<%=@page%>"/>
     
diff --git a/components/webmail/imapmailbox.rb b/components/webmail/imapmailbox.rb
index 78fc04c..6a606d8 100644
--- a/components/webmail/imapmailbox.rb
+++ b/components/webmail/imapmailbox.rb
@@ -335,7 +335,7 @@ class IMAPFolder
   
   def move_multiple(message_uids, dst_folder)
     activate
-    @mailbox.imap.uid_copy(message_uids, dst_folder)
+    @mailbox.imap.uid_copy(message_uids, @mailbox.folders[dst_folder].utf7_name)
     @mailbox.imap.uid_store(message_uids, "+FLAGS", :Deleted)
     @mailbox.folders[dst_folder].cached = false if @mailbox.folders[dst_folder]
     @mailbox.folders[dst_folder].mcached = false if @mailbox.folders[dst_folder]