Changeset 5134 for trunk/expressoMail1_2/js/main.js

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/js/main.js (modified) (72 diffs)

trunk/expressoMail1_2/js/main.js

@@ -5 +5 @@
 var autosave_time = 20000;
 
+var results_search_messages = ""; 
+var cabecalho = '<h4>ExpressoLivre - ExpressoMail</h4>'; 
+
 function init(){
         if (!is_ie)
@@ -20 +23 @@
 
                 preferences = data;
+                
+                
+                        if(preferences.show_name_print_messages == "1") { 
+                                                        var getUserName = document.getElementById("user_info"); 
+                                var userName = getUserName.innerHTML; 
+                                var position = userName.indexOf("-"); 
+                                var userName = userName.substring(3, position); 
+                                cabecalho = '<h4>' + userName; 
+                        }
+                
+                
                 current_folder="INBOX";
-                
-                version = (navigator.userAgent.match( /.+ie\s([\d.]+)/i ) || [])[1];
-                if(parseInt(version)==7 && (/trident\/\d/i.test(navigator.userAgent)))
-                        preferences.use_local_messages="0";
                 
                 if( (window.google && google.gears) && !google.gears.factory.getPermission())
@@ -318 +328 @@
                 // Call function to draw message
                 // If needed, delete old border
-                if (openTab.type[currentTab] == 2 || openTab.type[currentTab] == 3)
+                var isPartMsg = false;
+                for(var ii = 0; ii < partMsgs.length; ii++)
+                     if(partMsgs[ii] == ID) isPartMsg = true;               
+
+                if ((openTab.type[currentTab] == 2 || openTab.type[currentTab] == 3) && isPartMsg === false)
                         delete_border(currentTab,'false');
 
@@ -394 +408 @@
                 if(!verify_session(data))
                         return;
+                var total_messages_element = Element('tot_m');
                         
                 var box = Element("tbody_box");
@@ -415 +430 @@
 
                         var box = Element("tbody_box");
-                        table_element.insertBefore(box, Element("colgroup_main_"+numBox)); // keeps colgroup as the last child
-
-                        if (data.msgs_to_delete.length > 0)
+                        //table_element.insertBefore(box, Element("colgroup_main_"+numBox)); // keeps colgroup as the last child
+                        //table_element.appendChild(Element("colgroup_main_"+numBox));
+                        
+                        $(table_element).append(Element("colgroup_main_"+numBox));
+
+                        if (data.msgs_to_delete.length > 0){
                                 for (var i=0; i<data.msgs_to_delete.length; i++){
                                         if ( (data.msgs_to_delete[i] != undefined) && (data.msgs_to_delete[i] != "")){
@@ -423 +441 @@
                                         }
                                 }
-
+                        }
                         if (data[0].msg_folder != current_folder) // Bad request
                                 return false;
-
-                        var total_messages_element = Element('tot_m');
-
                         for (var i=0; i<data.length; i++){
                                 var existent = document.getElementById(data[i].msg_number);
@@ -437 +452 @@
                                         
                                         if( data[i].next_msg_number != undefined && data[i].next_msg_number != null ){
-                                                try { box.insertBefore(new_msg, box.childNodes[data[i].msg_key_position]); }
-                                                catch (e) { box.insertBefore(new_msg, box.firstChild); }
+                                                try {
+                                                        box.insertBefore(new_msg, box.childNodes[data[i].msg_key_position]);                                                    
+                                                }
+                                                catch (e){
+                                                        $(box).append(new_msg);
+                                                }
                                         }
                                         else if (data[i].Recent == 'N'){
@@ -446 +465 @@
                                                 box.appendChild(new_msg);
                                         }
-//                                      if( data[i].next_msg_number != undefined && data[i].next_msg_number != null )
-//                                              box.insertBefore(new_msg, Element(data[i].next_msg_number));
-//                                      else if (data[i].Recent == 'N')
-//                                              box.insertBefore(new_msg,box.firstChild);
-//                                      else
-//                                              box.appendChild(new_msg);
-
-//                                      total_messages_element.innerHTML = parseInt( total_messages_element.innerHTML ) + 1;
                                 }
                         }
@@ -460 +471 @@
                                 alert(data['new_msgs'] > 1 ? get_lang("You have %1 new messages", data['new_msgs']) + "!" : get_lang("You have 1 new message") +"!");
                         build_quota(data['quota']);
+                }
+                if(data.new_msgs){
+                        total_messages_element.innerHTML = parseInt( total_messages_element.innerHTML ) + data.new_msgs;
+                }else if(data.tot_msgs){
+                        total_messages_element.innerHTML = data.tot_msgs;
                 }
                 // Update Box BgColor
@@ -494 +510 @@
 }
 
-        function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){      
+function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){
+                        
+                        if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){
+                          alert( "Impossivel deletar mensagens que estão ainda estão sendo arquivadas." );
+                          return;
+                        }
+                                
                         var userTrashFolder = ''; 
                        
@@ -507 +529 @@
                                 else userTrashFolder = 'INBOX'+cyrus_delimiter+trashfolder; 
          
-                        if(openTab.type[currentTab] == 1) return move_search_msgs('content_id_'+currentTab,userTrashFolder,trashfolder); 
-                                if(currentTab.toString().indexOf("_r") != -1) msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
+                        if(openTab.type[currentTab] == 1) 
+                                        return move_search_msgs('content_id_'+currentTab,userTrashFolder,trashfolder); 
+                                        
+                                if(currentTab.toString().indexOf("_r") != -1) 
+                                        msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
                          
                         if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 
@@ -574 +599 @@
 
 function move_search_msgs(border_id, new_folder, new_folder_name){
+  
+        if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){
+          alert( "Impossivel mover mensagens que estão ainda estão sendo arquivadas." );
+          return;
+        }
+
         var selected_messages = '';
         var temp_msg;
@@ -663 +694 @@
 }
 
-function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg){
+function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg, not_opem_previus){
+        not_opem_previus = typeof(not_opem_previus) != 'undefined' ? not_opem_previus : false;
+        if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){
+            alert( "Impossivel mover mensagens que estão ainda estão sendo arquivadas." );
+            return;
+        }
+
         if (! folder || folder == 'null')
                 folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : (openTab.imapBox[currentTab] ? openTab.imapBox[currentTab]:get_current_folder());
@@ -689 +726 @@
                 }
                 mail_msg = ( Element("divScrollMain_"+numBox) ) ? Element("divScrollMain_"+numBox).firstChild.firstChild : Element("divScrollMain_0").firstChild.firstChild;
-                if (data.msgs_number.length == 1)
+                if (data.msgs_number.length == 1){
                         write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
-                else
+                }
+                else{
                         write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
+                }
 
                 if (openTab.type[currentTab] > 1){
@@ -701 +740 @@
                                         var previous_msg = msg_to_delete.previousSibling.id;
                                         //cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg);
+                                        if(!not_opem_previus){
                                         cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg);
+                                }
                                 }
                                 else
                                         delete_border(currentTab,'false');
                         }
-                        else
+                        else{
                                 delete_border(currentTab,'false');
+                        }
                         if(msg_to_delete)
                                 mail_msg.removeChild(msg_to_delete);
@@ -715 +757 @@
                         if(box.childNodes.length > 0){
                                 updateBoxBgColor(box.childNodes);
+                        }
+                        if(folder == get_current_folder()){
+                                Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - 1;
                         }
                         return;
@@ -770 +815 @@
                                 delete_border(data.border_ID,'false');
                 }
-                if(folder == get_current_folder())
+                if(folder == get_current_folder()){
                         Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - data.msgs_number.length;
-
+                }
                 refresh();
         }
@@ -796 +841 @@
                 }
 
-        if(currentTab.toString().indexOf("_r") != -1){
-                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
-                if(msgs_number.indexOf("_s1"))
-                           msgs_number = msgs_number.replace('_s1', '');
+        // se a aba estiver aberta e selecionada, apenas a msg da aba é movida
+        if(currentTab.toString().indexOf("_r") != -1)
+        {
+                //se a aba for aberta atraves de uma pesquisa
+                if(currentTab.toString().indexOf('_s') != -1)
+                   msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_s'));
+                else
+                    msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_r'));
         }
 
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
-            var params = "&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+escape(new_folder)+"&new_folder_name="+escape(new_folder_name)+"&get_previous_msg="+preferences.delete_and_show_previous_message;
-            cExecute ("$this.imap_functions.move_messages",handler_move_msgs,params);
+                if(!not_opem_previus){
+                        cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+preferences.delete_and_show_previous_message, handler_move_msgs);
+                }else{
+                        cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+false, handler_move_msgs);
         }
-        else
+        }else
                 write_msg(get_lang('No selected message.'));
 
 }
 
-function move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name) {
-        move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,true);
+function move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name, not_opem_previus) {
+        move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,true, not_opem_previus);
+}
+
+//Caso deseja-se que não se abra a mensagem anterior independente da 
+//preferencia do usuario
+function move_msgs_not_previus(folder, msgs_number, border_ID, new_folder, new_folder_name) {
+        move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,true, true);
+}
+
+function normalizeMsgNumber( msgNumber ){
+  
+      if (msgNumber || msgNumber == 'selected')
+          msgNumber = get_selected_messages();
+
+
+      // se a aba estiver aberta e selecionada, apenas a msg da aba é movida
+      if(currentTab.toString().indexOf("_r") != -1)
+      {
+            //se a aba for aberta atraves de uma pesquisa
+            if(currentTab.toString().indexOf('_s') != -1)
+                msgNumber = currentTab.toString().substr(0,currentTab.toString().indexOf('_s'));
+            else
+                msgNumber = currentTab.toString().substr(0,currentTab.toString().indexOf('_r'));
+      }
+      
+      if (parseInt(msgNumber) <= 0 || msgNumber.length <= 0){
+            write_msg(get_lang('No selected message.'));
+            return( false );
+      }
+      
+      return( msgNumber );
+
 }
 
@@ -828 +910 @@
                 id_msgs = get_selected_messages();
 
+        if ( parseInt(id_msgs) <= 0 || id_msgs.length <= 0 )
+            return write_msg(get_lang('No selected message.'));
+        
         if(folder_dest=='local_root' || folder_dest==null) //Caso seja o primeiro arquivamento...
                 folder_dest = 'local_Inbox';
 
-        if (parseInt(id_msgs) > 0 || id_msgs.length > 0)
-                expresso_mail_sync.archive_msgs(folder,folder_dest,id_msgs);
-                //cExecute("$this.imap_functions.get_info_msgs&folder=" + folder + "&msgs_number=" + id_msgs , handler_arquivar_mensagens);
-        else
-                write_msg(get_lang('No selected message.'));
-
+        id_msgs = expresso_local_messages.checkArchived( id_msgs, folder_dest );
+
+         if( !id_msgs ){
+              write_msg( "Todas as mensagens já foram arquivadas anteriormente." );
+              return;
+          }
+  
+        document.getElementById("overlay").style.visibility = "visible";
+
+        var handler_arquivar_mensagens = function(data) {
+          
+            var msgs_info = [];
+          
+            for( var i = 0; i < data.length; i++ )
+                msgs_info[i] = connector.unserialize( data[i] );
+
+            //vejo se já tinha mensagens locais
+            var h = expresso_local_messages.has_local_mails();
+            
+            expresso_local_messages.insert_mails( msgs_info, folder_dest, function( s, f ){complete_archiving( s, f, h )} );
+
+            document.getElementById("overlay").style.visibility = "hidden";
+        }
+
+        cExecute( "$this.imap_functions.get_info_msgs&folder=" + folder + "&msgs_number=" + id_msgs, handler_arquivar_mensagens );
+}
+
+function complete_archiving( success, fails, has_local_messages_before )
+{
+    var msgs_to_remove = {};
+    var target = 'INBOX' + cyrus_delimiter + trashfolder + cyrus_delimiter + 'tmpMoveToLocal';
+    
+    success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success );
+
+    for (var i = 0; i < success.length; i++) {
+        
+        var msg_info = success[i];
+
+//      if ( msg_info.dest_folder == target )
+//      {
+//              msg_info.msg_folder += (Date.parse(new Date));
+//      }
+
+        //////////////// deselecionando ////////////////
+        Element('chk_box_select_all_messages').checked = false;
+
+        if ( Element("check_box_message_" + msg_info.original_id) ) 
+        {
+                Element("check_box_message_" + msg_info.original_id).checked = false;
+        }
+        if ( Element(msg_info.original_id) )
+        {
+                remove_className(Element(msg_info.original_id), 'selected_msg');
+        }
+
+//      if ( tree_folders._selected.id.indexOf( 'local_' ) == 0 || msg_info.dest_folder.indexOf( target ) == 0 )
+//      {
+//              openTab.imapBox[0] = '';
+//              tree_folders.getNodeById( 'local_Inbox' )._select( );
+//              change_folder('local_Inbox','Inbox');
+//      }
+        /////////////////////////////////////////////////
+
+        //As mensagens arquivadas devem ser removidas, caso o usuario tenha isso configurado.
+        msgs_to_remove[ msg_info.original_folder ] = msgs_to_remove[ msg_info.original_folder ] || [];
+        msgs_to_remove[ msg_info.original_folder ].push( msg_info.original_id );
+    }
+
+    if (preferences.keep_archived_messages == 0) {
+            //Remove as mensagens
+            for( var folder in msgs_to_remove ){
+                if(folder != 'undefined')
+                        delete_msgs(folder, msgs_to_remove[folder],'null',false,true);
+            }
+    }
+
+    if( !has_local_messages_before && expresso_local_messages.has_local_mails() )
+            ttreeBox.update_folder();
+    else
+            update_menu();
 }
 
@@ -853 +1012 @@
 
         // Get all TR (messages) in tBody.
-        if(currentTab.toString().indexOf("_r") != -1){
-            return currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
-        }
-
         var main_list = main.childNodes;
 
-        var _check_box;
+        var _tab_prefix = getTabPrefix();
         var selected_messages = '';
         var selected_messages_by_shortcuts = '';
@@ -865 +1020 @@
         for (j; j<(main_list.length); j++)
         {
-                _check_box = Element("check_box_message_" + main_list[j].id);
-
-                if ( (_check_box) && (_check_box.checked) )
+
+if ( (!isNaN(parseInt(numBox))) && (numBox == 0)) { 
+                                        check_box = Element("check_box_message_" + main_list[j].id); 
+                                } else { 
+                                        id_mensagem = main_list[j].id.split('_'); 
+                                                                check_box = Element("search_" + numBox + "_check_box_message_" + id_mensagem[0]); 
+                                }        
+                                 
+                                if ( (check_box) && (check_box.checked) ) 
                     selected_messages += main_list[j].id + ',';
 
@@ -880 +1041 @@
         selected_messages = selected_messages.substring(0,(selected_messages.length-1));
 
+                         
+                        /* Verifica se está na tela de pesquisa. */ 
+                        if(selected_messages.indexOf("_") != -1) 
+                        { 
+                                results_search_messages = selected_messages; 
+                                /* Retira a informação da aba */ 
+                                selected_messages = selected_messages.substring(0,selected_messages.indexOf("_"));
+        }
+        
+
         if (preferences.use_shortcuts == '1')
         {
@@ -897 +1068 @@
         else
                 return selected_messages;
-}
-
-function get_selected_messages_folder(){
-        var _main;
-        var _main_list;
-        try{
-                _main = document.getElementById("divScrollMain_"+numBox).firstChild.firstChild;
-        }catch(e){
-        };
-
-        if (! _main)
-                _main = Element("tbody_box_"+numBox);
-
-        if (! _main)
-                _main = Element("tbody_box");
-
-        // Get all TR (messages) in tBody.
-        _main_list = _main.childNodes;
-
-        var _check_box;
-        var selected_messages_folder;
-//      var selected_messages_by_shortcuts = '';
-        var j = 0;
-        for (j; j<(_main_list.length); j++)
-        {
-
-                _check_box = Element("check_box_message_" + _main_list[j].id);
-
-                if ( (_check_box) && (_check_box.checked) && (_main_list[j].name) ) {
-                        if (!selected_messages_folder)
-                                selected_messages_folder = _main_list[j].name;
-                        else {
-                                if (selected_messages_folder!=_main_list[j].name)
-                                        return false;
-                        }
-                }
-        }
-        return selected_messages_folder;
 }
 
@@ -971 +1104 @@
                                         9 : get_lang("Reply without history"),
                                         10: get_lang("Reply to all without history")};
-
+                        if(new_border_ID != 0)
                         if(!confirm(get_lang("Your message to %1 has not been saved or sent. "+
                                                 "To %2 will be necessary open it again. Discard your message?",
@@ -982 +1115 @@
                         }
                 }
+        }
+        if (new_border_ID == 'maximo'){
+                RichTextEditor.editorReady = true;
+                return false;
         }
         if (new_border_ID == false)
@@ -1039 +1176 @@
         if (document.getElementById("subject_" + border_ID))
                 data.subject = document.getElementById("subject_" + border_ID).innerHTML;
+        if(data.subject == get_lang("(no subject)   "))
+                data.subject = '';
+                
         if (document.getElementById("body_" + border_ID))
                 data.body = document.getElementById("body_" + border_ID).innerHTML;
@@ -1052 +1192 @@
                 data.date_hour = Element('date_hour_' + border_ID).value;
         }
+        
         var signature = RichTextEditor.getSignatureDefault();
-        if(type!="new" && type!="edit")
+        
+        if(type!="new" && type!="edit" && document.getElementById("is_local_"+border_ID) != null)
                 data.is_local_message = (document.getElementById("is_local_"+border_ID).value=="1")?true:false;
         switch(type){
@@ -1061 +1203 @@
                         title = "Re: " + data.subject;
                         Element("subject_" + new_border_ID).value = "Re: " + data.subject;                      
-                        useOriginalAttachments(new_border_ID,border_ID,data.is_local_message);
+
+        if (data.is_local_message){  
+                alert(get_lang("In the local file attachments, including images, will be disregarded. To forward / reply with the attachments, please first make the reopening of the message")+'.');  
+        var imagens = data.body.match(/<img[^>]*>/g);  
+        if(imagens != null)  
+                        for (var x = 0; x < imagens.length; x++)  
+                                data.body = data.body.replace(imagens[x],'');  
+        }else{
+                useOriginalAttachments(new_border_ID,border_ID);                        
+        }      
+
                         // Insert the signature automaticaly at message body if use_signature preference is set
                         if (preferences.use_signature == "1"){  
@@ -1077 +1229 @@
                         Element("subject_" + new_border_ID).value = "Re: " + data.subject;
                         Element("to_" + new_border_ID).value = data.to;
-                        useOriginalAttachments(new_border_ID,border_ID,data.is_local_message);
+                        if(data.is_local_message){
+                                alert(get_lang("In the local file attachments, including images, will be disregarded. To forward / reply with the attachments, please first make the reopening of the message")+'.');  
+                var imagens = data.body.match(/<img[^>]*>/g);  
+                if(imagens != null)  
+                                        for (var x = 0; x < imagens.length; x++)  
+                                                data.body = data.body.replace(imagens[x],'');  
+                        }else{
+                                useOriginalAttachments(new_border_ID,border_ID);
+                        }
+                        
                         block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
                         // Insert the signature automaticaly at message body if use_signature preference is set
@@ -1112 +1273 @@
                                 Element('space_link_' + new_border_ID).style.display='none';
                         }
-                        useOriginalAttachments(new_border_ID,border_ID,data.is_local_message);
+                        if (data.is_local_message){  
+                                alert(get_lang("In the local file attachments, including images, will be disregarded. To forward / reply with the attachments, please first make the reopening of the message")+'.');  
+                var imagens = data.body.match(/<img[^>]*>/g);  
+                if(imagens != null)  
+                                        for (var x = 0; x < imagens.length; x++)  
+                                                data.body = data.body.replace(imagens[x],'');  
+                     }      
+                else useOriginalAttachments(new_border_ID,border_ID);  
+
                         // Insert the signature automaticaly at message body if use_signature preference is set
                         if (preferences.use_signature == "1")  
@@ -1160 +1329 @@
                         break;
                 case "forward":
-                        data.is_local_message = (document.getElementById("is_local_"+border_ID).value=="1")?true:false;
+                        
                         msg_forward_from = document.createElement('input');
                         msg_forward_from.id = "msg_forward_from_" + new_border_ID;
@@ -1169 +1338 @@
                         document.getElementById("subject_" + new_border_ID).value = "Fw: " + data.subject;
                         var divFiles = Element("divFiles_"+new_border_ID);
+                        
+                        
+                        if (data.is_local_message) {//Local messages  
+                                document.getElementById("is_local_forward"+new_border_ID).value = "1";  
+                alert(get_lang("In the local file attachments, including images, will be disregarded. To forward / reply with the attachments, please first make the reopening of the message")+'.');  
+                var imagens = data.body.match(/<img[^>]*>/g);  
+                if(imagens != null)  
+                                        for (var x = 0; x < imagens.length; x++)  
+                                                data.body = data.body.replace(imagens[x],'');    
+                    }
+                else{  
+
+                        
+                        
                         var campo_arquivo;
+                        
                         if (Element("attachments_" + border_ID)){
                                 var attachments = document.getElementById("attachments_" + border_ID).getElementsByTagName("a");
                                 
-                                for (var i = (attachments.length > 1 ? 1 : 0); i < attachments.length; i++){
+                                for (var i = 0; i < attachments.length; i++){
                                         if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") ||
                                                         ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1)))
@@ -1191 +1375 @@
                                                 }
                                                 else {
-                                                        var tempNomeArquivo = attachments[i].firstChild.nodeValue.split("(");
-                                                        var nomeArquivo = trim(tempNomeArquivo[0]);
+                                                        var tempNomeArquivo = tmp.split("&newfilename=");
+                                                        var nomeArquivo = tempNomeArquivo[tempNomeArquivo.length - 1];
                                                 }
 
@@ -1218 +1402 @@
                                 }
                         }
+                        }
                         // Insert the signature automaticaly at message body if use_signature preference is set
-if (preferences.use_signature == "1")   
+                        if (preferences.use_signature == "1")  
                                             RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 
                                         else   
@@ -1266 +1451 @@
                         Element("to_" + new_border_ID).value = data.to;
                         if (data.cc){
+                                data.cc = data.cc.replace(/&lt;/gi,"<");
+                                data.cc = data.cc.replace(/&gt;/gi,">");
                                 Element("cc_" + new_border_ID).value = data.cc;
-                                Element("space_link_" + new_border_ID).style.display = 'none';
                                 Element("a_cc_link_" + new_border_ID).style.display = 'none';
+                                if(Element("cco_" + new_border_ID) != null)
+                                        Element("space_link_" + new_border_ID).style.display = 'none';
                                 Element("tr_cc_"+ new_border_ID).style.display = '';
                         }
                         if (data.cco){
+                                if(Element("cco_" + new_border_ID) != null){
                                 Element("cco_" + new_border_ID).value = data.cco;
                                 Element("space_link_" + new_border_ID).style.display = 'none';
@@ -1277 +1466 @@
                                 Element("tr_cco_"+ new_border_ID).style.display = '';
                         }
+                        }
                         Element("subject_" + new_border_ID).value = data.subject;
                         
@@ -1284 +1474 @@
                         var element_important_message = Element("important_message_" + new_border_ID);
                         if(element_important_message) {
-                                if(Element("is_important_" + border_ID).value == "1") element_important_message.checked = true;
+                                        
+                                if(Element("disposition_important_" + border_ID))
+                                        element_important_message.checked = true;                               
                         }
 
@@ -1301 +1493 @@
                                         tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
                                         a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                        s_tmp = trim(escape(connector.serialize(a_tmp)));
+                                        s_tmp = escape(connector.serialize(a_tmp));
+
                                         divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
                                         divFiles.appendChild(link_attachment);
@@ -1315 +1508 @@
         set_border_caption("border_id_" + new_border_ID, title);
 
-
+        resizeWindow();
+        //save_msg(new_border_ID);
         return new_border_ID; //Preciso retornar o ID da nova mensagem.
 }
@@ -1484 +1678 @@
         {
                 var handler = function(data){
-                        if(typeof(expresso_local_messages) != "undefined"){
+
                         if(data.msg_day == '')
                         {
                                 header=expresso_local_messages.get_msg_date(data.original_ID, proxy_mensagens.is_local_folder(get_current_folder()));
-                                if(header){
+
                                 data.fulldate=header.fulldate;
                                 data.smalldate=header.smalldate;
                                 data.msg_day = header.msg_day;
                                 data.msg_hour = header.msg_hour;
-                        }
-                        }
+
                       }
                         this.show_msg(data);
@@ -1564 +1757 @@
         mail_as_plain = ( mail_as_plain ) ? mail_as_plain.checked : false;
 
+       var content_body  = RichTextEditor.getData('body_'+ID);
+       //Remove imagens do corpo que estao com o checkbox desmarcados
+       var files_checkbox =  $("#divFiles_"+ID+" input:checkbox");
+       var files_unchecked = new Array();
+       for (var i = 0; i < files_checkbox.length; i++)
+            if(files_checkbox[i].checked !== true)
+                files_unchecked.push(connector.unserialize(unescape(trim(files_checkbox[i].value))));
+
+       var imagens = content_body.match(/<img[^>]*>/g);
+       
+       if(imagens != null)
+            for (var x = 0; x < imagens.length; x++)
+                for (var xx = 0; xx < files_unchecked.length; xx++)
+                    if(imagens[x].indexOf('indexPart='+files_unchecked[xx][3].replace(/'/g,'')) !== -1)
+                         content_body = content_body.replace(imagens[x],'');
+                
+        //--------------------------------------------------------------------------//
+        
         var textArea = document.createElement("TEXTAREA");
         textArea.style.display='none';
         textArea.name = "body";
-        textArea.value = RichTextEditor.getData('body_'+ID); 
+        textArea.value = content_body;
+   
         var input_folder = document.createElement("INPUT");
         input_folder.style.display='none';
@@ -1633 +1845 @@
                 handler_send_message(data_return,ID);
         }
-        else
+        else{
                 cExecuteForm("$this.imap_functions.send_mail", form, handler_send_message, ID);
+        }
+}
+function is_valid_email(campo){ 
+        var invalidEmail = searchEmail(campo);
+        var semicolon = campo.split(";");
+        
+        if((campo.replace(/^\s+|\s+$/g,"")) != ""){
+                        if(invalidEmail[0] == true){
+                                write_msg("Erro de SMTP: Os endereços de destinatário a seguir falharam: "+ invalidEmail[1]);
+                                return false;
+                        }else{
+                                if(semicolon.length > 1){
+                                        var stringError = "Erro de SMTP: Os endereços devem ser separados apenas por vígula: ";
+                                        for(var i= 0; i < semicolon.length; i++){
+                                                stringError = stringError + semicolon[i];
+                                                if(i+1 < semicolon.length)
+                                                        stringError = stringError + " ; ";
+                                        }
+                                        write_msg(stringError);
+                                        return false;
+                                }else {
+                                        return true;
+                                }
+                        }
+        }
+        else{
+                write_msg(get_lang("Message without receiver"));
+                return false;
+        }               
 }
 function change_tr_properties(tr_element, newUid, newSubject){
@@ -1657 +1898 @@
 {
         Element("send_button_"+border_id).style.visibility="visible";
-        var handler_delete_msg = function(data){refresh(preferences.alert_new_msg);};
-
-        if (data == null || data.append != true )
+        var handler_delete_msg = function(data){refresh(preferences.alert_new_msg);RichTextEditor.execPosInstance('body_'+border_id);};
+        if(data === null)
         {
-                RichTextEditor.saveFlag = 0;
-                if (! data.append)
-                    if(data == 'Post-Content-Length')
-                        write_msg(get_lang('The size of this message has exceeded  the limit (%1B).', preferences.max_attachment_size ? preferences.max_attachment_size : Element('upload_max_filesize').value));
-                else
+            write_msg(get_lang('ERROR saving your message.'));
+            return null;
+        }
+
+        if(data.append === "Over quota"){
+                write_msg(get_lang('ERROR saving your message over quota.'));
+                return;
+        }
+        else if ( data.append !== true )
+        {
+                if (data.append == null)
                     write_msg(get_lang('ERROR saving your message.'));
                 else
@@ -1685 +1931 @@
         {
                 var newImage = false;
+                RichTextEditor.saveFlag = 1;
                 openTab.imapUid[border_id] = data.msg_no;
                 openTab.imapBox[border_id] = data.folder_id;
 
                 var newTitle = document.getElementById('subject_'+border_id).value;
-                if (newTitle == '')
+                if (newTitle.length > 18)
+                    newTitle = newTitle.substr(18) + '...';
+                else if (newTitle == '')
                     newTitle = get_lang("No subject");
-                set_border_caption('border_id_'+border_id, newTitle);
+                document.getElementById('font_border_id_'+border_id).innerHTML = newTitle;                 
+                Element('border_id_'+border_id).title = newTitle; 
 
                 // Replace the embedded images for new uids
                 var content_body  = RichTextEditor.getData('body_'+border_id);
-
-                if (is_ie)
+                var body_images   = content_body.match(/msgNumber=\d*/g);
+                var folder_images = content_body.match(/msgFolder=[^&]*&/g);            
+
+                if (body_images != null)
                 {
-                    var content_body =  mainField.document.getElementsByTagName('body').item(0).innerHTML;
-                    var body_images = content_body.match(/msg_num=\d*/g);
-                    var images_part = content_body.match(/msg_part=\d*/g);
-                    if (body_images)
+                    for (var i=0; i<body_images.length; i++)
                     {
-                        for (var i=0; i<body_images.length; i++){
-                            content_body = content_body.replace(body_images[i],"msg_num="+openTab.imapUid[border_id]);
+                        if( folder_images != null)
+                          content_body = content_body.replace(folder_images[i], "msgFolder=INBOX" + cyrus_delimiter + draftsfolder +"&");
+
+
+                            
+                        
+                        content_body = content_body.replace(body_images[i],"msgNumber="+openTab.imapUid[border_id]);
+                    }
+
+                    var images_part   = content_body.match(/indexPart=[0-9.]*/g);
+
+                    if(images_part != null)
+                                {
+                        for (var x = 0; x < images_part.length; x++)
+                                {
+                            var position = images_part[x].substr(10,images_part[x].length);
+                            content_body = content_body.replace(images_part[x],'indexPart(||.|||.||)='+data.imagesParts[position]);
+                                }
+
                         }
-
-                        var allImgs = new Array (images_part.length);
-                        //var j=-1;
-                        for (var i in images_part){
-
-                            if (i == 0)
-                                var image_number = parseInt(images_part[i].substr(9));
-                            else
-                                image_number = "null";
-                            
-                            if (! isNaN(image_number))
-                            {
-                                if (! allImgs[image_number])
-                                {
-                                    allImgs[image_number] = true;
-                                    //j--;
-                                }
-                                //content_body = content_body.replace(images_part[i],'msg_part='+j);
-                            }
-                            //content_body = content_body.replace(/msg_part=-/g,'msg_part=');
-                        }
-                        
+                    content_body = content_body.replace(/indexPart\(\|\|\.\|\|\|\.\|\|\)=/g,'indexPart=');             
                     }
-                }
-                else
-                    {
-                        for (var i = 0; i < bodyChildNodes.length; i++){
-                            if (typeof(bodyChildNodes[i].tagName) != 'undefined' && bodyChildNodes[i].tagName.search(/img/i) != -1)
-                            {
-                                bodyChildNodes[i].src =  bodyChildNodes[i].src.replace(/msg_num=\d*/g, "msg_num="+openTab.imapUid[border_id]);
-
-                                var allImgs = new Array();
-                                var image_number = parseInt(bodyChildNodes[i].src.match(/msg_part=\d*/g)[0].substr(9));
-                                if (! allImgs[image_number])
-                                {
-                                    allImgs[image_number] = true;
-                                }
-                            }
-                            else
-                                {
-                                    continue;
-                                }
-
-                        }
-                    }
+
+                   
 
                 //Replace all files to new files
                 var divFiles = Element("divFiles_"+border_id);
-                elFiles = divFiles.getElementsByTagName("input");
-                var countCheck =0;
-                for (var i=0; i<elFiles.length; i++) {
-                    if(elFiles[i].value !=""){
-                        if (elFiles[i].type == "checkbox") {
-                            var tmpData = connector.unserialize(decodeURIComponent(elFiles[i].value));
-                            tmpData[1] = data.msg_no;
-                            elFiles[i].value = encodeURIComponent(connector.serialize(tmpData));
-                            countCheck++;
-                        }
-                        else {
-                            elFiles[i].value ="";
-                            parantNodeFile = elFiles[i].parentNode.parentNode;
-                            parantNodeFile.removeChild(elFiles[i].parentNode);
-                            i--;
-                        }
-                    }
-                }
+                divFiles.innerHTML = '';
+
 
                 var attach_files = connector.unserialize(data.files);
                 if (attach_files != null) {
                     openTab.countFile[border_id] = attach_files.length;
-                    att_index = countCheck;
-                    for (att_index; att_index < attach_files.length; att_index++)
-                    {
+                    for (var att_index = 0; att_index < attach_files.length; att_index++){
 
                         var link_attachment = document.createElement("a");
-                        var fileName = attach_files[att_index].substr(0,attach_files[att_index].indexOf('_SIZE_'));
-                        var fileSize = parseInt(attach_files[att_index].substr(attach_files[att_index].indexOf('_SIZE_')+6))/1024
-                        link_attachment.innerHTML = fileName + " ("+borkb((parseInt(fileSize)*1024))+")";
-
-                        var href = "'"+folder_id+"','"+data.msg_no+"','"+(att_index)+"','"+(att_index+2)+"','base64'";
+
+                        var fileName = Base64.decode(attach_files[att_index].name);
+                        var fileSize = attach_files[att_index].size / 1024;
+                        
+                        
+                        link_attachment.innerHTML = fileName + " ("+parseInt(fileSize)+" kb)";
+                                                
+                                                var encoding = /\.eml$/.exec(fileName)? '7bit' : 'base64';
+                        var href = "'"+folder_id+"','"+data.msg_no+"','"+(att_index)+"','0."+(att_index+1)+"','"+encoding+"'";
 
                         link_attachment.setAttribute("href", "javascript:download_attachments("+href+")");
@@ -1793 +2004 @@
                         s_tmp = escape(connector.serialize(a_tmp));
 
-                        var check_attachment = document.createElement("INPUT");
+                        var check_attachment = document.createElement("input");
                         check_attachment.type = 'CHECKBOX';
                         check_attachment.name = 'forwarding_attachments[]';
-                        check_attachment.value = trim(s_tmp);
-
-                        if (!divFiles.childNodes[0])
-                        {
-                            divFiles.appendChild(document.createElement("BR"));
-                        }
-                        else
-                            {
-                                divFiles.insertBefore(document.createElement("BR"),divFiles.childNodes[0]);
-                            }
-
-                        divFiles.insertBefore(link_attachment,divFiles.childNodes[0]);
-                        divFiles.insertBefore(check_attachment,divFiles.childNodes[0]);
-
-                        check_attachment.checked = true;
-                        check_attachment.setAttribute("checked", "checked");
+                        check_attachment.value = s_tmp;
+
+
 
                         divFiles.appendChild(check_attachment);
                         divFiles.appendChild(link_attachment);
+
                         divFiles.appendChild(document.createElement("br"));
+                                                
+                                                check_attachment.checked = true;
+                        check_attachment.setAttribute("checked", "checked");
                     }
                                         } 
@@ -1843 +2045 @@
                         change_tr_properties(tr_msg, data.msg_no, data.subject);
                     }
-                } else {
-                    refresh();
-                }
-
-                var save_link = Element("save_message_options_"+border_id);
-                save_link.onclick = '';
-                save_link.className = 'message_options_inactive';
-                watch_changes_in_msg(border_id);
-                write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
-                setTimeout( function(){RichTextEditor.saveFlag = 1;}, 1000 );
-        }
-}
-
-function save_msg(border_id,withImage){
+
+        }
+                setTimeout( function(){RichTextEditor.saveFlag = 1;RichTextEditor.execPosInstance('body_'+border_id);}, 1000 );
+        }
+        return null;
+}
+
+function save_msg(border_id,withImage, out){
         if (typeof(withImage) == 'undefined')
                 withImage = false;
@@ -1867 +2063 @@
                 var folder_id = openTab.imapBox[border_id];
         else
-                var folder_id = "INBOX/"+draftsfolder;
+                var folder_id = "INBOX" + cyrus_delimiter + draftsfolder;
 
         if (folder_id == 'INBOX') // and folder name from border
@@ -1879 +2075 @@
         tmp_folder_id=folder_id;
         message_id = openTab.imapUid[border_id];
-        var handler_save_msg = function(data){return_save(data,this.tmp_border_id,this.tmp_folder_name,this.tmp_folder_id,this.message_id);}
+        var handler_save_msg = function(data){
+                if(typeof(out) == 'undefined'){
+                        return_save(data,this.tmp_border_id,this.tmp_folder_name,this.tmp_folder_id,this.message_id);
+                        var save_link = Element("save_message_options_"+border_id);
+                        if(!withImage){
+                                if(data.append === true){
+                                        save_link.className = 'message_options_inactive';
+                                        save_link.onclick = '';
+                                        watch_changes_in_msg(border_id);        
+                                        write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
+                                }
+                                if(auto){
+                                        auto = false;
+                                }
+                        }
+                        else{
+                                write_msg(get_lang('Wait a moment, your image is uploading ...'));
+                                var auto = true;
+                                setTimeout( function(){save_msg(border_id)}, 1000 );
+                        }
+                }else{
+                        if(data.append === true){
+                                write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
+                        }else if(data.append == null){
+                                write_msg(get_lang('ERROR saving your message.'));
+                        }if(data.append === "Over quota"){
+                                write_msg(get_lang('ERROR saving your message over quota.'));
+                        }
+                }
+                
+        }
 
         var mail_as_plain = document.getElementById( 'textplain_rt_checkbox_' + border_id );
         mail_as_plain = ( mail_as_plain ) ? mail_as_plain.checked : false;
 
+        var content_body  = RichTextEditor.getData("body_"+border_id);
+       //Remove imagens do corpo que estao com o checkbox desmarcados
+       var files_checkbox =  $("#divFiles_"+border_id+" input:checkbox");
+       var files_unchecked = new Array();
+       for (var i = 0; i < files_checkbox.length; i++)
+            if(files_checkbox[i].checked !== true)
+                files_unchecked.push(connector.unserialize(unescape(trim(files_checkbox[i].value))));
+
+       var imagens = content_body.match(/<img[^>]*>/g);
+       if(imagens != null)
+            for (var x = 0; x < imagens.length; x++)
+                for (var xx = 0; xx < files_unchecked.length; xx++)
+                    if(imagens[x].indexOf('indexPart='+files_unchecked[xx][3].replace(/'/g,'')) !== -1)
+                         content_body = content_body.replace(imagens[x],'');
+        
+        if(files_unchecked.length > 0)
+            RichTextEditor.setData("body_"+border_id,content_body);
+            
+        
         var textArea = document.createElement("TEXTAREA");
         textArea.style.display='none';
         textArea.name = "body";
-        textArea.value = RichTextEditor.getData("body_"+border_id);
+        textArea.value = content_body;
         var input_folder = document.createElement("INPUT");
         input_folder.style.display='none';
@@ -1948 +2193 @@
         }
         else
-                write_msg('ERROR saving your message.');
+                write_msg(get_lang('ERROR saving your message.'));
 }
 
@@ -1957 +2202 @@
         tmp_folder_name=folder_name;
         var handler_save_msg = function(data){return_saveas(data,this.tmp_border_id,this.tmp_folder_name);}
+        
+       var content_body  = RichTextEditor.getData("body_"+border_id);
+       //Remove imagens do corpo que estao com o checkbox desmarcados
+       var files_checkbox =  $("#divFiles_"+border_id+" input:checkbox");
+       var files_unchecked = new Array();
+       for (var i = 0; i < files_checkbox.length; i++)
+            if(files_checkbox[i].checked !== true)
+                files_unchecked.push(connector.unserialize(unescape(trim(files_checkbox[i].value))));
+
+       var imagens = content_body.match(/<img[^>]*>/g);
+       
+       if(imagens != null)
+            for (var x = 0; x < imagens.length; x++)
+                for (var xx = 0; xx < files_unchecked.length; xx++)
+                    if(imagens[x].indexOf('indexPart='+files_unchecked[xx][3].replace(/'/g,'')) !== -1)
+                         content_body = content_body.replace(imagens[x],'');
+        
         var textArea = document.createElement("TEXTAREA");
         textArea.style.display='none';
         textArea.name = "body";
-        textArea.value = RichTextEditor.getData("body_"+border_id);
+        textArea.value = content_body;
 
         var input_folder = document.createElement("INPUT");
@@ -1984 +2246 @@
 function set_messages_flag(flag, msgs_to_set){
         var handler_set_messages_flag = function (data){
-                var _tab_sufix = getTabSufix();
-                var _chk_box;
-                var _fld_box;
                 if(!verify_session(data))
                         return;
-                var msgs_to_set = data.msgs_to_set.split(","); // messages ids
-                var rowids_to_set = data.rowids_to_set.split(","); // rows ids
+                var msgs_to_set = data.msgs_to_set.split(",");
 
                 if(!data.status) {
@@ -1996 +2254 @@
                         Element('chk_box_select_all_messages').checked = false;
                         for (var i = 0; i < msgs_to_set.length; i++) {
-                                Element("check_box_message_" + rowids_to_set[i]).checked = false;
-                                remove_className(Element(rowids_to_set[i]), 'selected_msg');
+                                Element("check_box_message_" + msgs_to_set[i]).checked = false;
+                                remove_className(Element(msgs_to_set[i]), 'selected_msg');
                         }
                         if(!data.msgs_unflageds)
@@ -2027 +2285 @@
                                 }
                                 proxy_mensagens.get_msg(msgs_to_set[i],current_folder, false, setFlag);
-                        }
-
-                        _chk_box = Element("check_box_message_" + rowids_to_set[i]);
-                        _fld_box = (_tab_sufix ? Element("check_box_message_" + msgs_to_set[i]) : null);
-                        if(_chk_box){
+
+
+                        }
+                        if(Element("check_box_message_" + msgs_to_set[i])){
                                 switch(data.flag){
                                         case "unseen":
-                                                set_msg_as_unread(rowids_to_set[i]);
-                                                if (_fld_box)
                                                     set_msg_as_unread(msgs_to_set[i]);
-                                                _chk_box.checked = false;
+                                                if(results_search_messages != "") 
+                                                        set_msg_as_unread(results_search_messages, true);
+                                                Element("check_box_message_" + msgs_to_set[i]).checked = false;
                                                 break;
                                         case "seen":
-                                                set_msg_as_read(rowids_to_set[i], false);
-                                                if (_fld_box)
-                                                        set_msg_as_read(msgs_to_set[i]);
-                                                _chk_box.checked = false;
+                                                set_msg_as_read(msgs_to_set[i], false);
+                                                if(results_search_messages != "") 
+                                                        set_msg_as_read(results_search_messages, false, true);
+                                                Element("check_box_message_" + msgs_to_set[i]).checked = false;
                                                 break;
                                         case "flagged":
-                                                set_msg_as_flagged(rowids_to_set[i]);
-                                                if (_fld_box)
                                                     set_msg_as_flagged(msgs_to_set[i]);
-                                                _chk_box.checked = false;
+                                                if(results_search_messages != "") 
+                                                        set_msg_as_flagged(results_search_messages, true);
+                                                document.getElementById("check_box_message_" + msgs_to_set[i]).checked = false;
                                                 break;
                                         case "unflagged":
-                                                set_msg_as_unflagged(rowids_to_set[i]);
-                                                if (_fld_box)
                                                     set_msg_as_unflagged(msgs_to_set[i]);
-                                                _chk_box.checked = false;
+                                                if(results_search_messages != "") 
+                                set_msg_as_unflagged(results_search_messages, true);
+                                                Element("check_box_message_" + msgs_to_set[i]).checked = false;
                                                 break;
                                 }
@@ -2064 +2321 @@
 
         var folder = get_current_folder();
-        if (msgs_to_set == 'get_selected_messages') {
+        if (msgs_to_set == 'get_selected_messages')
                 var msgs_to_set = this.get_selected_messages();
-                if ( (msgs_to_set) && (msgs_to_set.match(/_s/)) ) {
-                        folder = get_selected_messages_folder();
-                        if (!folder) {
-                                alert(get_lang("You cant manipulate messages from multiple folders on search"));
-                                return;
-                        }
-                }
-        }
         else
                 folder = Element("input_folder_"+msgs_to_set+"_r").value;
 
         if (msgs_to_set)
-                if (folder && proxy_mensagens.is_local_folder(folder))
-                        expresso_local_messages.set_messages_flag(msgs_to_set, flag); //expresso_local_messages.set_messages_flag(msgs_to_set.replace(/_s[^,]*/g,""), flag);
-                else
                 cExecute ("$this.imap_functions.set_messages_flag&folder="+folder+"&msgs_to_set="+msgs_to_set+"&flag="+flag, handler_set_messages_flag);
         else
@@ -2137 +2383 @@
         var folder= Element('border_id_0').innerHTML;
         var thead = Element('divScrollHead_'+numBox).firstChild.firstChild.innerHTML;
+        
+        msgs_number = get_selected_messages();
+        if(msgs_number == false){
         var tbody = Element('divScrollMain_'+numBox).firstChild.firstChild.innerHTML;
+        }else{
+                msgs_number = msgs_number.split(",");
+                var tbody = "";
+                for(var i = 0; i < msgs_number.length; i++){
+                        tbody += "<tr id="+msgs_number[i]+" class=\"tr_msg_unread tr_msg_read2\">"+ Element(msgs_number[i]).innerHTML+"</tr>";
+                }       
+        }
         var print_width = screen.width - 200;
         var x = ((screen.width - print_width) / 2);
@@ -2151 +2407 @@
         thead = thead.replace(seekDot, "style='display:none'");
         tbody = tbody.replace(seekDot, "style='display:none'");
-
+        thead = thead.replace("<td style=\"cursor: pointer;\"></td>", "");              
+        thead = thead.replace("<td style=\"cursor: pointer;\" style='display:none'><input title=\"Selecionar todas as mensagens.\" class=\"checkbox\" id=\"chk_box_select_all_messages\" type=\"checkbox\"></td>", "");
         while (1){
                 try{
@@ -2157 +2414 @@
                         var html = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"><html>'
                         + '<head><link rel="stylesheet" type="text/css" href="templates/'+template+'/print.css"></head>'
-                        + '<body class="print-all-messages"><h1>ExpressoLivre - ExpressoMail</h1>'
+                    + cabecalho + '</h4><hr>' 
                         + '<h2>'+folder+'</h2><hr/><blockquote><font size="2">'
                         + '<table width="100%" cellpadding="0" cellspacing="0">'
@@ -2204 +2461 @@
                 else if(countAtt > 1) 
                         for (var i = 1; i <attachments.getElementsByTagName('a').length; i++) 
-                                att += attachments.getElementsByTagName('a')[i].innerHTML + " | "; 
+                                att += " | " + attachments.getElementsByTagName('a')[i].innerHTML; 
         } 
                 
         var body = Element('body_'+border_ID); 
         
-        if(!is_ie)
-            {
-                var link = location.href.replace(/\/expressoMail1_2\/(.*)/, "");
-                var tab_tags = body.getElementsByTagName("IMG");
-                for(var i = 0; i < tab_tags.length;i++)
-                    {
-                        var _img = document.createElement("IMG");
-                        _img.src = tab_tags[i].src;
-                        if(tab_tags[i].src.toUpperCase().indexOf('/INC/SHOW_EMBEDDED_ATTACH.PHP?MSG_FOLDER=') > -1)
-                            {
-                                _img.src = link + '/expressoMail1_2'+tab_tags[i].src.substr(tab_tags[i].src.toUpperCase().indexOf('/INC/SHOW_EMBEDDED_ATTACH.PHP?MSG_FOLDER='));
-                            }
-                        tab_tags[i].parentNode.replaceChild(_img,tab_tags[i]);
-                    }
-            }
         var print_width = screen.width - 200;
         var x = ((screen.width - print_width) / 2);
@@ -2258 +2500 @@
                 try{
                         var html ='<body>';
-                        html += "<h4>ExpressoLivre - ExpressoMail</h4><hr>";
+                        html += cabecalho + '</h4><hr>';
                         html += '<table><tbody>';
                         if(sender)
@@ -2289 +2531 @@
                         html += "</tbody></table><hr>";
                         window_print.document.write(html + body.innerHTML);
-                        if(!is_ie){
+
                                 var tab_tags = window_print.document.getElementsByTagName("IMG");
+                        var link = location.href.replace(/\/expressoMail1_2\/(.*)/, "");
                                 for(var i = 0; i < tab_tags.length;i++){
-                                        var _img = document.createElement("IMG");
-                                        _img.src = tab_tags[i].src;
+                                var _img = tab_tags[i].cloneNode(true);
+                                if(tab_tags[i].src.toUpperCase().indexOf('INC/GET_ARCHIVE.PHP?MSGFOLDER=') > -1)
+                                    _img.src = link + '/expressoMail1_2/'+tab_tags[i].src.substr(tab_tags[i].src.toUpperCase().indexOf('INC/GET_ARCHIVE.PHP?MSGFOLDER='));
+
                                         tab_tags[i].parentNode.replaceChild(_img,tab_tags[i]);
                                 }
-                        }
+                        
                         break;
                 }
@@ -2319 +2564 @@
                         if (get_current_folder() == 'INBOX'+cyrus_delimiter+trashfolder){
                                 draw_paging(0);
-                                kill_current_box();
+                                remove_rows(document.getElementById("table_box"));                              
                                 Element('tot_m').innerHTML = 0;
                                 Element('new_m').innerHTML = 0;
@@ -2339 +2584 @@
                 if (get_current_folder() == 'INBOX'+cyrus_delimiter+spamfolder){
                         draw_paging(0);
-                        kill_current_box();
+                        remove_rows(document.getElementById("table_box"));
                 }
                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+spamfolder).alter({caption: get_lang("Spam")});
@@ -2367 +2612 @@
                         write_msg(get_lang('Error compressing messages (ZIP). Contact the administrator.'));
                 }
-                else
-                        download_attachments(null, null, data, null,null,'mensagens.zip');
+                else{
+                        var filename = 'mensagens.zip'; 
+                        if (data.match(/\.eml$/gi)) { 
+                                filename = 'fonte_da_mensagem.eml'; 
+                        } 
+                        download_attachments(null, null, data, null,null,filename);
+                }
         }
 
@@ -2379 +2629 @@
 }
 
-function select_all_search_messages(select, id){
-        var search_box = Element("table_resultsearch_" + getNumBoxFromTabId(id)).firstChild;
-        var felement = search_box.firstChild;
-        while(felement)
-        {
-                if (select) {
-                        felement.firstChild.firstChild.checked = true;
-                        add_className(felement, 'selected_msg');
-                }
-                else {
-                        felement.firstChild.firstChild.checked = false;
-                        remove_className(felement, 'selected_msg');
-                }
-                felement = felement.nextSibling;
-        }
+function select_all_search_messages(select, aba){
+           jQuery(function() {
+        if(select){
+                        jQuery("#"+aba+" tr").each(function(i, o) {
+                        
+                                o.firstChild.firstChild.checked = true;
+                                add_className(o, 'selected_msg');
+                        });             
+                }else{
+                        jQuery("#"+aba+" tr").each(function(i, o) {
+                        
+                                o.firstChild.firstChild.checked = false;
+                                remove_className(o, 'selected_msg');
+                        });
+        }
+        });
+
+        
+
 }
 
@@ -2426 +2680 @@
         }
 }
+function save_image2(info){ 
+        var obj = jQuery.parseJSON(unescape(info)); 
+        download_attachments(obj.folder, obj.message, obj.thumbIndex, obj.pid, obj.encoding, obj.type.replace("/",".")); 
+} 
 
 function nospam(msgs_number, border_ID, folder){
         if (folder == 'null')
                 folder = get_current_folder();
-        var new_folder  = 'INBOX';
+        var new_folder = '';
+        if(folder.substr(0,4) == 'user'){
+                arrayFolder = folder.split(cyrus_delimiter);
+                new_folder = 'user'+cyrus_delimiter+arrayFolder[1];
+        }
+        else{
+                new_folder = 'INBOX';
+        }
         var new_folder_name = get_lang('INBOX');
         var handler_move_msgs = function(data){
@@ -2449 +2714 @@
 
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0)
-                cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=false"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+preferences.delete_and_show_previous_message+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs);
+                cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=false"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+0+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs);
         else
                 write_msg(get_lang('No selected message.'));
@@ -2457 +2722 @@
         if (folder == 'null')
                 folder = get_current_folder();
-        var new_folder = 'INBOX'+cyrus_delimiter+'Spam';
+        var new_folder = '';
+        if(folder.substr(0,4) == 'user')
+        {       
+                arrayFolder = folder.split(cyrus_delimiter);
+                new_folder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+spamfolder;
+        }
+        else
+        {
+                new_folder = 'INBOX' + cyrus_delimiter + spamfolder;
+        }
         var new_folder_name = 'Spam';
+        var not_opem_previus = true;
         var handler_move_msgs = function(data){
-                proxy_mensagens.proxy_move_messages(folder, msgs_number, border_ID, new_folder, new_folder_name);
-                if (openTab.type[currentTab] > 1)
+                proxy_mensagens.proxy_move_messages(folder, msgs_number, border_ID, new_folder, new_folder_name, not_opem_previus);
+                if (openTab.type[currentTab] > 1){
+                        if(preferences.delete_and_show_previous_message == 1)
                         delete_border(currentTab,'false');
+        }
         }
 
@@ -2471 +2748 @@
 
         if(parseInt(msgs_number) > 0 || msgs_number.length > 0)
-                cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=true"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+preferences.delete_and_show_previous_message+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs);
+                cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=true"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+0+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs);
         else
                 write_msg(get_lang('No selected message.'));
@@ -2565 +2842 @@
                         if ( er.test(wfolders_tree._selected.id) )
                         {
-                                archive_msgs('INBOX/Lixeira/tmpMoveToLocal',wfolders_tree._selected.id,data);
-                                cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal');
+                                alert( "Mensagens não podem ser importadas em pastas locais" );
+                                //archive_msgs('INBOX/Lixeira/tmpMoveToLocal',wfolders_tree._selected.id,data);
+                                //cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal');
                         }
                                                  else{
@@ -2614 +2892 @@
 }
 function import_calendar(data){
+    var import_url = '$this.db_functions.import_vcard&msg_folder='+data;
+
         function handler_import_calendar(data){
                 if(data === true){
                         write_msg(get_lang("The event was imported successfully."));
                 }
+            else if( data['url'] )
+            {
+                var form = document.createElement( "form" );
+
+                form.setAttribute( "action", DEFAULT_URL + data['url'] + '&isPost=true' );
+                form.setAttribute( "method", "POST" );
+
+                document.body.appendChild( form );
+
+                form.submit();
+            }
+            else
+                write_msg(get_lang(data));
         }
         if(confirm(get_lang("Do you confirm this import to your Calendar?"))){
-                        cExecute('$this.db_functions.import_vcard&msg_folder='+data,handler_import_calendar);
-        }
+                    cExecute( import_url +'&from_ajax=true',handler_import_calendar);
+    }
+}
+function open_msg_part(data){
+        var handler_open_msg_part = function (data)
+        {
+            if(data.append == 1)
+            {
+                proxy_mensagens.get_msg(data.msg_number,data.msg_folder,false,show_msg);
+                partMsgs.push(data.msg_number);
+        }
+            else
+               write_msg(data.append);
+        }
+        cExecute('$this.imap_functions.ope_msg_part&msg_folder='+data+'&save_folder=INBOX'+cyrus_delimiter+trashfolder , handler_open_msg_part);        
 }
 function hack_sent_queue(data,rowid_message) {
@@ -2696 +3002 @@
                 var er_Email =  new RegExp("<(.*?)>"); 
                 // TODO Use validateEmail of common functions !
-                var er_ValidaEmail = new RegExp("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$");
+                var er_ValidaEmail = new RegExp("^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*(\.[a-zA-Z]{2,3})$");
 
                 for (i=0; i < arrayEmailsFull.length; i++){
@@ -2702 +3008 @@
                         tempEmail = email == null  ? arrayEmailsFull[i]:email[1];
                         tempEmail = tempEmail.replace(/^\s+|\s+$/g,"");
+                        
                         if (tempEmail != '') {
                                 singleEmail = er_ValidaEmail.exec(tempEmail);
-
                                 if (singleEmail == null) {
                                         arrayInvalidEmails[0] = true;
-                                        arrayInvalidEmails[1] += (email == null ? arrayEmailsFull[i] : email[1]) + "; ";
+                                        arrayInvalidEmails[1] += (email == null ? arrayEmailsFull[i] : email[1]) + "";
                                 }
                         }