Changeset 2547

Timestamp:

04/15/10 11:19:50 (14 years ago)

Author:

amuller

Message:

Ticket #1036 - Corrigindo js e otimizando a criação do jspack

Location:

trunk

Files:

• expressoMail1_2/js/jscode (modified) (1 prop)
• expressoMail1_2/js/jscode/abas.js (modified) (8 diffs)
• expressoMail1_2/js/jscode/draw_api.js (modified) (91 diffs)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/inc/class.javascript.inc.php (modified) (1 diff)
• phpgwapi/js/dJSWin (modified) (1 prop)
• phpgwapi/js/dJSWin/dJSWin.js (modified) (5 diffs)
• phpgwapi/js/dTabs (modified) (1 prop)
• phpgwapi/js/dftree (modified) (1 prop)
• phpgwapi/js/dftree/dftree.js (modified) (21 diffs)
• phpgwapi/js/expressoAjax (modified) (1 prop)
• phpgwapi/js/jscalendar (modified) (1 prop)
• phpgwapi/js/jscalendar/lang (modified) (1 prop)
• phpgwapi/js/tools (modified) (1 prop)
• phpgwapi/js/venus (modified) (1 prop)
• phpgwapi/js/wz_dragdrop (modified) (1 prop)

trunk/expressoMail1_2/js/jscode/abas.js

@@ -41 +41 @@
                                         if (Element('viewsource_rt_checkbox').checked)
                                         {  
-                                                expresso.connector.loadScript("jscode/rich_text_editor");
+                                                expresso.connector.loadScript("rich_text_editor");
                                                 RichTextEditor.viewsource(false);
                                         }
@@ -58 +58 @@
         if(Element("font_border_id_" + ID))
                 Element("font_border_id_" + ID).className = 'font-menu-sel';
-        var c = Element("content_id_"+ID)
+        var c = Element("content_id_"+ID);
         if (c)
                 c.style.display = '';
@@ -66 +66 @@
                 try{
                         if(ID){
-                                expresso.connector.loadScript("jscode/rich_text_editor");
+                                expresso.connector.loadScript("rich_text_editor");
                                 RichTextEditor.loadEditor(ID);
                         }
@@ -73 +73 @@
                 catch(e){
                         //alert(e.message);
-                }
+                };
         }
 
@@ -137 +137 @@
                 borderTitle = borderTitle.substring(0, resize*0.08);
 
-        td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/close_button.gif'></td></tr></table>";
+        td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'></td></tr></table>";
 
         bb = document.getElementById("border_blank");
@@ -203 +203 @@
 function delete_border(ID, msg_sent)
 {
-        var borderElem = Element("border_id_" + ID)
+        var borderElem = Element("border_id_" + ID);
         if (borderElem)
                 borderElem.onclick = null; // It's avoid a FF3 bug
@@ -215 +215 @@
                 {
                                 var save_link = Element("save_message_options_"+ID);
-                                if (openTab.toPreserve[ID] == undefined)
+                                if (openTab.toPreserve[ID] == undefined);
                                         openTab.toPreserve[ID] = false;
                                 if ((! openTab.toPreserve[ID] && ! ID.toString().match("_r")) || ((body.contentWindow) == 'object' && body.contentWindow.document.designMode.toLowerCase() == 'on') && (save_link.onclick != ''))
@@ -228 +228 @@
                                         {
                                                 if (openTab.imapBox[ID] &&  openTab.imapUid[ID] && !openTab.toPreserve[ID]){
-                                                        delete_msgs(openTab.imapBox[ID], openTab.imapUid[ID].toString(), 0)
+                                                        delete_msgs(openTab.imapBox[ID], openTab.imapUid[ID].toString(), 0);
                                                         openTab.toPreserve[ID] = false;
                                                         }

trunk/expressoMail1_2/js/jscode/draw_api.js

@@ -1 @@
- var openTab = {
+var openTab = {
         'type' : [], // 8 types of tabs, further info. see expressolivre.org/dev/wiki/mail/Documentacao
         'content_id' : [],
@@ -16 +16 @@
         'reply_to_all_without_history':7,
         'edit':5
-        }
+};
 var currentTab,numBox = 0; // Open Tab and num of mailboxes opened at context
 
@@ -23 +23 @@
 function Map()
 {
-    this.keys = new Array();
-    this.values = new Array();
+        this.keys = new Array();
+        this.values = new Array();
 }
 
 Map.prototype.add = function(key, value)
 {
-    this.keys.push(key);
-    this.values.push(value);
-}
+        this.keys.push(key);
+        this.values.push(value);
+};
 
 Map.prototype.get = function(key)
 {
-    result = new Array();
-    for (i = 0; i < this.keys.length; i++)
-    {
-        if (this.keys[i] == key)
-        {
-            result.push(this.values[i]);
-        }
-    }
-
-    if (result.length == 0)
-    {
-        return null;
-    }
-
-    return result;
-}
+        result = new Array();
+        for (i = 0; i < this.keys.length; i++)
+        {
+                if (this.keys[i] == key)
+                {
+                        result.push(this.values[i]);
+                }
+        }
+
+        if (result.length == 0)
+        {
+                return null;
+        }
+
+        return result;
+};
 
 var translatedFolders = new Map();
@@ -56 +56 @@
 function draw_tree_folders(folders){
         // Check if the tree folders alredy exist.
-        translatedFolders = new Map();
+        translatedFolders = new Map();
         if (Element('dftree_tree_folders')){
                 if (!expresso_offline) {
@@ -70 +70 @@
                                                         unseen_in_shared_folders = parseInt( unseen_in_shared_folders + data[ i ].folder_unseen );
                                         }
-        
+
                                         var folder_unseen = Element('dftree_'+data[i].folder_id+'_unseen');
-                                        
+
                                         if ((folder_unseen) && (data[i].folder_unseen > 0))
                                         {
@@ -90 +90 @@
                                         if(data[i].folder_id == current_folder){                                        
                                                 var old_new_m = isNaN(parseInt(Element('new_m').innerHTML)) ? parseInt(Element('new_m').firstChild.innerHTML) : parseInt(Element('new_m').innerHTML);
-        //                                      if(!isNaN(old_new_m) && old_new_m < data[i].folder_unseen){
-        //                                              Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) + (parseInt(data[i].folder_unseen)-old_new_m);
-        //                                      }
+                                                //                                      if(!isNaN(old_new_m) && old_new_m < data[i].folder_unseen){
+                                                //                                              Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) + (parseInt(data[i].folder_unseen)-old_new_m);
+                                                //                                      }
                                                 Element('new_m').innerHTML = data[i].folder_unseen ? '<font color="RED">'+data[i].folder_unseen+'</font>' : 0;
                                                 draw_paging(Element('tot_m').innerHTML);
@@ -102 +102 @@
                                 //      display_unseen_in_mailbox.alter({caption:'<font style=color:red>[</font><span id="dftree_root_unseen" style="color:red">' + unseen_in_mailbox +'</span><font style=color:red>]</font> ' + get_lang("My Folders")});
                                 //else
-                                        display_unseen_in_mailbox.alter({caption:get_lang("My Folders")});
+                                display_unseen_in_mailbox.alter({caption:get_lang("My Folders")});
                                 display_unseen_in_mailbox._refresh();
-        
+
                                 var display_unseen_in_shared_folders = tree_folders.getNodeById( 'user' );
                                 if ( display_unseen_in_shared_folders )
@@ -114 +114 @@
                                         display_unseen_in_shared_folders._refresh();
                                 }
-                        }
+                        };
                         expresso.connector.cacheNextRequest(1);
                         cExecute ("expressoMail1_2.imap_functions.get_folders_list&folder=INBOX", update_tree_folders);
                 }
-        
+
                 return;
         }
@@ -124 +124 @@
                 if (!expresso_offline) {
                         tree_folders = new dFTree({name: 'tree_folders'});
-        
+
                         var n_root = new dNode({id:'root', caption: get_lang("My Folders")});
                         tree_folders.add(n_root,'anything'); //Places the root; second argument can be anything.
-        
+
                         var unseen_in_mailbox = 0;
                         var unseen_in_shared_folders = 0;
@@ -138 +138 @@
 
                                         var nn = new dNode({id:folders[i].folder_id, caption:lang_folder(folders[i].folder_name) + '<font style=color:red>&nbsp(</font><span id="dftree_'+folders[i].folder_id+'_unseen" style=color:red>'+folders[i].folder_unseen+'</span><font style=color:red>)</font>', onClick:"change_folder('"+folders[i].folder_id+"','"+folders[i].folder_name+"')", plusSign:folders[i].folder_hasChildren}); 
-                                
+
                                         if( folders[i].folder_name.toLowerCase() == 'inbox' )
                                                 Element('new_m').innerHTML = '<font style="color:red">' + folders[i].folder_unseen + '</font>';
@@ -144 +144 @@
                                 else
                                         var nn = new dNode({id:folders[i].folder_id, caption:lang_folder(folders[i].folder_name), onClick:"change_folder('"+folders[i].folder_id+"','"+folders[i].folder_name+"')", plusSign:folders[i].folder_hasChildren}); 
-                                
+
                                 if (folders[i].folder_parent == '')
                                         folders[i].folder_parent = 'root';
                                 else if (folders[i].folder_parent == 'user'){   
-                                        
+
                                         if (!tree_folders.getNodeById('user')){
-                                                tmpFolderId = folders[i].folder_id.split(cyrus_delimiter).pop();
-                                                if (tmpFolderId != folders[i].folder_name)
-                                                {
-                                                    translatedFolders.add(tmpFolderId, folders[i].folder_name);
-                                                }
+                                                tmpFolderId = folders[i].folder_id.split(cyrus_delimiter).pop();
+                                                if (tmpFolderId != folders[i].folder_name)
+                                                {
+                                                        translatedFolders.add(tmpFolderId, folders[i].folder_name);
+                                                }
                                                 var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared folders"), plusSign:true}); 
                                                 tree_folders.add(n_root_shared_folders,'root');
@@ -173 +173 @@
                         else{
                                 if (!window.google || !google.gears) {
-                                temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to be redirected to gears installation page?"));
-                                if (temp) {
-                                        location.href = "http://gears.google.com/?action=install&message="+
-                                        "Para utilizar o recurso de mensagens locais, instale o google gears&return=" +
-                                        document.location.href;
-                                }
-                                else {
-                                        preferences.use_local_messages=0;
-                                }
-                        }
-                        else{
-                                if (expresso_offline) 
-                                        tree_folders = new dFTree({
-                                                name: 'tree_folders'
-                                        });
-                                var root_local = new dNode({
-                                        id: "local_root",
-                                        caption: get_lang('local folders')
-                                });
-                                tree_folders.add(root_local, "root"); //coloca root local
-                                var local_folders = expresso_local_messages.list_local_folders();
-                                for (var i in local_folders) { //Coloca as pastas locais.
-                                        var node_root = "local_root";
-                                        var new_caption = local_folders[i][0];
-                                        if (local_folders[i][0].indexOf("/") != "-1") {
-                                                final_pos = local_folders[i][0].lastIndexOf("/");
-                                                node_root = "local_" + local_folders[i][0].substr(0, final_pos);
-                                                new_caption = local_folders[i][0].substr(final_pos + 1);
+                                        temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to be redirected to gears installation page?"));
+                                        if (temp) {
+                                                location.href = "http://gears.google.com/?action=install&message="+
+                                                        "Para utilizar o recurso de mensagens locais, instale o google gears&return=" +
+                                                        document.location.href;
                                         }
-                                        if (local_folders[i][1] > 0) 
-                                                var nodeLocal = new dNode({
-                                                        id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
-                                                        plusSign: local_folders[i][2]
-                                                });
-                                        else 
-                                                var nodeLocal = new dNode({
-                                                        id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(new_caption),
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
-                                                        plusSign: local_folders[i][2]
-                                                });
-                                                tree_folders.add(nodeLocal, node_root);
+                                        else {
+                                                preferences.use_local_messages=0;
                                         }
                                 }
-                        }               
-                }
-
-                tree_folders.draw(Element('content_folders'));
-                if (!expresso_offline) {
-                        n_root.changeState();
-                        folder_select = (current_folder ? current_folder:"INBOX");
-                        if (typeof(tree_folders.getNodeById(folder_select)) == 'undefined')
-                                return false;
-                        tree_folders.getNodeById(folder_select)._select();
-                }
-                else {
-                        root_local.changeState();
-                        tree_folders.getNodeById('local_Inbox')._select();
-                }
-
-                var trash_span=document.getElementById('lINBOX/'+trashfolder+'tree_folders');
-                var draft_span=document.getElementById('lINBOX/'+draftsfolder+'tree_folders');
-                var sent_span=document.getElementById('lINBOX/'+sentfolder+'tree_folders');
-                var spam_span=document.getElementById('lINBOX/'+spamfolder+'tree_folders');
-
-                if (trash_span)
-                        trash_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_trash.png)";
-
-                if (draft_span)
-                        draft_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_draft.png)"
-
-                if (sent_span)
-                        sent_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_sent.png)";
-
-                if (spam_span)
-                        spam_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_spam.png)";
-
-
-                draw_paging(Element('tot_m').innerHTML);
-                if(document.getElementById("nINBOX/"+trashfolder+"tree_folders"))
-                {
-                        var trash = document.createElement("SPAN");
-                        trash.id = 'empty_trash';
-                        trash.className = 'clean_folder';
-                        trash.style.cursor = 'pointer';
-                        trash.onclick = function () {empty_trash_imap();};
-                        trash.innerHTML = "["+get_lang("Clean")+"]";
-                        trash.title=get_lang("Empty trash");
-                        trash.onmouseover = function() {trash.style.color="red";};
-                        trash.onmouseout= function() {trash.style.color="#666666";};
-                        document.getElementById("nINBOX/"+trashfolder+"tree_folders").appendChild(trash);
-                }
-                if(document.getElementById("nINBOX/"+spamfolder+"tree_folders"))
-                {
-                        var spam = document.createElement("SPAN");
-                        spam.id = 'empty_spam';
-                        spam.className = 'clean_folder';
-                        spam.style.cursor = 'pointer';
-                        spam.style.padding = '0 0 0 6px';
-                        spam.onclick = function () {empty_spam_imap();};
-                        spam.innerHTML = "["+get_lang("Clean")+"]";
-                        spam.title=get_lang("Empty Spam Folder");
-                        spam.onmouseover = function() {spam.style.color="red";};
-                        spam.onmouseout= function() {spam.style.color="#666666";};
-                        document.getElementById("nINBOX/"+spamfolder+"tree_folders").appendChild(spam);
-               }
-
-                // Draw right menu folders.
-                /*
-                var treeroot = document.getElementById('chroottree_folders'); 
-                for (var linkBox = treeroot.firstChild; linkBox != null; linkBox = linkBox.nextSibling)
-                        _dragArea.makeMenuBox(linkBox);
-                */
-
-                if(!expresso_offline)
-                        var display_unseen_in_mailbox = tree_folders.getNodeById( 'root' );
-                else
-                        var display_unseen_in_mailbox = tree_folders.getNodeById( 'local_root' );
-                //if ( unseen_in_mailbox )
-                //      display_unseen_in_mailbox.alter({caption:'<font style=color:red>[</font><span id="dftree_root_unseen" style="color:red">' + unseen_in_mailbox +'</span><font style=color:red>]</font> ' + get_lang("My Folders")});
-                //else
-                        display_unseen_in_mailbox.alter({caption:get_lang("My Folders")});
-                display_unseen_in_mailbox._refresh();
-
-                var display_unseen_in_shared_folders = tree_folders.getNodeById( 'user' );
-                if ( display_unseen_in_shared_folders )
-                {
-                        if ( unseen_in_shared_folders )
-                                display_unseen_in_shared_folders.alter({caption:'<font style=color:red>[</font><span id="dftree_user_unseen" style="color:red">' + unseen_in_shared_folders +'</span><font style=color:red>]</font> ' + get_lang("Shared folders")});
-                        else
-                                display_unseen_in_shared_folders.alter({caption:get_lang("Shared folders")});
-                        display_unseen_in_shared_folders._refresh();
-                }
-        }
-
-        if (!expresso_offline) {
-                var folder_create = "";
-                var nm1 = "";
-                if(tree_folders._folderPr.length > 0){
-                        var nm_folder = "";
-                        for(var i=0; i < tree_folders._folderPr.length; i++){
-                                nm_folder = tree_folders._folderPr[i].split(cyrus_delimiter);
-                                if(nm_folder[0] == "INBOX"){
-                                        if(nm1 == ""){
+                                else{
+                                        if (expresso_offline) 
+                                                tree_folders = new dFTree({
+name: 'tree_folders'
+});
+var root_local = new dNode({
+id: "local_root",
+caption: get_lang('local folders')
+});
+tree_folders.add(root_local, "root"); //coloca root local
+var local_folders = expresso_local_messages.list_local_folders();
+for (var i in local_folders) { //Coloca as pastas locais.
+        var node_root = "local_root";
+        var new_caption = local_folders[i][0];
+        if (local_folders[i][0].indexOf("/") != "-1") {
+                final_pos = local_folders[i][0].lastIndexOf("/");
+                node_root = "local_" + local_folders[i][0].substr(0, final_pos);
+                new_caption = local_folders[i][0].substr(final_pos + 1);
+        }
+        if (local_folders[i][1] > 0) 
+                var nodeLocal = new dNode({
+id: "local_" + local_folders[i][0],
+caption: lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
+onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
+plusSign: local_folders[i][2]
+});
+else 
+var nodeLocal = new dNode({
+id: "local_" + local_folders[i][0],
+caption: lang_folder(new_caption),
+onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
+plusSign: local_folders[i][2]
+});
+tree_folders.add(nodeLocal, node_root);
+}
+}
+}               
+}
+
+tree_folders.draw(Element('content_folders'));
+if (!expresso_offline) {
+        n_root.changeState();
+        folder_select = (current_folder ? current_folder:"INBOX");
+        if (typeof(tree_folders.getNodeById(folder_select)) == 'undefined')
+                return false;
+        tree_folders.getNodeById(folder_select)._select();
+}
+else {
+        root_local.changeState();
+        tree_folders.getNodeById('local_Inbox')._select();
+}
+
+var trash_span=document.getElementById('lINBOX/'+trashfolder+'tree_folders');
+var draft_span=document.getElementById('lINBOX/'+draftsfolder+'tree_folders');
+var sent_span=document.getElementById('lINBOX/'+sentfolder+'tree_folders');
+var spam_span=document.getElementById('lINBOX/'+spamfolder+'tree_folders');
+
+if (trash_span)
+        trash_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_trash.png)";
+
+if (draft_span)
+        draft_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_draft.png)";
+
+if (sent_span)
+        sent_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_sent.png)";
+
+if (spam_span)
+        spam_span.style.backgroundImage="url(" + URL_SERVER + "/phpgwapi/templates/"+template+"/images/foldertree_spam.png)";
+
+
+        draw_paging(Element('tot_m').innerHTML);
+        if(document.getElementById("nINBOX/"+trashfolder+"tree_folders"))
+{
+        var trash = document.createElement("SPAN");
+        trash.id = 'empty_trash';
+        trash.className = 'clean_folder';
+        trash.style.cursor = 'pointer';
+        trash.onclick = function () {empty_trash_imap();};
+        trash.innerHTML = "["+get_lang("Clean")+"]";
+        trash.title=get_lang("Empty trash");
+        trash.onmouseover = function() {trash.style.color="red";};
+        trash.onmouseout= function() {trash.style.color="#666666";};
+        document.getElementById("nINBOX/"+trashfolder+"tree_folders").appendChild(trash);
+}
+if(document.getElementById("nINBOX/"+spamfolder+"tree_folders"))
+{
+        var spam = document.createElement("SPAN");
+        spam.id = 'empty_spam';
+        spam.className = 'clean_folder';
+        spam.style.cursor = 'pointer';
+        spam.style.padding = '0 0 0 6px';
+        spam.onclick = function () {empty_spam_imap();};
+        spam.innerHTML = "["+get_lang("Clean")+"]";
+        spam.title=get_lang("Empty Spam Folder");
+        spam.onmouseover = function() {spam.style.color="red";};
+        spam.onmouseout= function() {spam.style.color="#666666";};
+        document.getElementById("nINBOX/"+spamfolder+"tree_folders").appendChild(spam);
+}
+
+// Draw right menu folders.
+/*
+   var treeroot = document.getElementById('chroottree_folders'); 
+   for (var linkBox = treeroot.firstChild; linkBox != null; linkBox = linkBox.nextSibling)
+   _dragArea.makeMenuBox(linkBox);
+   */
+
+if(!expresso_offline)
+        var display_unseen_in_mailbox = tree_folders.getNodeById( 'root' );
+        else
+        var display_unseen_in_mailbox = tree_folders.getNodeById( 'local_root' );
+        //if ( unseen_in_mailbox )
+        //      display_unseen_in_mailbox.alter({caption:'<font style=color:red>[</font><span id="dftree_root_unseen" style="color:red">' + unseen_in_mailbox +'</span><font style=color:red>]</font> ' + get_lang("My Folders")});
+        //else
+        display_unseen_in_mailbox.alter({caption:get_lang("My Folders")});
+        display_unseen_in_mailbox._refresh();
+
+        var display_unseen_in_shared_folders = tree_folders.getNodeById( 'user' );
+if ( display_unseen_in_shared_folders )
+{
+        if ( unseen_in_shared_folders )
+                display_unseen_in_shared_folders.alter({caption:'<font style=color:red>[</font><span id="dftree_user_unseen" style="color:red">' + unseen_in_shared_folders +'</span><font style=color:red>]</font> ' + get_lang("Shared folders")});
+        else
+                display_unseen_in_shared_folders.alter({caption:get_lang("Shared folders")});
+        display_unseen_in_shared_folders._refresh();
+}
+}
+
+if (!expresso_offline) {
+        var folder_create = "";
+        var nm1 = "";
+        if(tree_folders._folderPr.length > 0){
+                var nm_folder = "";
+                for(var i=0; i < tree_folders._folderPr.length; i++){
+                        nm_folder = tree_folders._folderPr[i].split(cyrus_delimiter);
+                        if(nm_folder[0] == "INBOX"){
+                                if(nm1 == ""){
+                                        nm1 = nm_folder[1];
+                                        folder_create = "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
+                                }else{
+                                        if( nm1 != nm_folder[1]){
+                                                folder_create += "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
                                                 nm1 = nm_folder[1];
-                                                folder_create = "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
-                                        }else{
-                                                if( nm1 != nm_folder[1]){
-                                                        folder_create += "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
-                                                        nm1 = nm_folder[1];
-                                                }
                                         }
                                 }
                         }
                 }
-                if(folder_create != ""){
-                        if(confirm(get_lang("There are folders with invalid format. Do you want to fix them?"))){
-                                var handler_correct_folders = function(data){
-                                        //Timeout to release HTTPRequest , loadScript and update tree folders.
-                                        if(data)
-                                                setTimeout("expresso.connector.loadScript('jscode/TreeShow');ttreeBox.update_folder();",500);
-                                }
-                                cExecute("expressoMail1_2.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create);
-                        }
-                }
-        }
+        }
+        if(folder_create != ""){
+                if(confirm(get_lang("There are folders with invalid format. Do you want to fix them?"))){
+                        var handler_correct_folders = function(data){
+                                //Timeout to release HTTPRequest , loadScript and update tree folders.
+                                if(data)
+                                        setTimeout("expresso.connector.loadScript('jscode/TreeShow');ttreeBox.update_folder();",500);
+                        };
+                        cExecute("expressoMail1_2.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create);
+                }
+        }
+}
 }
 
@@ -351 +351 @@
                 var has_changes = false;
                 for (var i in local_folders) { //Coloca as pastas locais.
-                        
+
                         var new_caption = local_folders[i][0];
                         if(local_folders[i][0].indexOf("/")!="-1") {
@@ -357 +357 @@
                                 new_caption = local_folders[i][0].substr(final_pos+1);
                         }
-                        
+
                         var folder_unseen = Element('dftree_local_'+local_folders[i][0]+'_unseen');
-                        
+
                         if ((folder_unseen) && (local_folders[i][1] > 0))
                         {
@@ -395 +395 @@
 
 function update_menu(data){
-                /*
-                 * @AUTHOR Rodrigo Souza dos Santos
-                 * @DATE 2008/09/15
-                 * @BRIEF When occurs a error in imap server show the message that is in file "error.html".
-                 */
-                if ( data && data.imap_error )
-                {
-                        if(preferences.use_local_messages==1 && expresso_local_messages.is_offline_installed){
-                                conf = confirm(get_lang("The expresso imap server is currently down, expresso noticed you have offline mail module installed, would you like to use it?"));
-                                if(conf) {
-                                        window.onresize = function() {
-                                                var target = document.getElementById('divAppbox');
-                                                target.style.height= document.body.clientHeight - 83;
-                                        }
+        /*
+         * @AUTHOR Rodrigo Souza dos Santos
+         * @DATE 2008/09/15
+         * @BRIEF When occurs a error in imap server show the message that is in file "error.html".
+         */
+        if ( data && data.imap_error )
+        {
+                if(preferences.use_local_messages==1 && expresso_local_messages.is_offline_installed){
+                        conf = confirm(get_lang("The expresso imap server is currently down, expresso noticed you have offline mail module installed, would you like to use it?"));
+                        if(conf) {
+                                window.onresize = function() {
                                         var target = document.getElementById('divAppbox');
-                                        document.getElementById("divAppboxHeader").innerHTML="";
                                         target.style.height= document.body.clientHeight - 83;
-                                        expresso_local_messages.set_as_logged(account_id,0,true);
-                                        target.innerHTML = "<iframe src='offline.php?inside=1' width='100%' height='100%' frameBorder='0'></iframe>";
-                                        return false;
-                                }
-                        }
-                        expresso.connector.newRequest('error.html', URL_SERVER + '/expressoMail1_2/templates/'+template+'/error.html', 'GET',
+                                };
+                                var target = document.getElementById('divAppbox');
+                                document.getElementById("divAppboxHeader").innerHTML="";
+                                target.style.height= document.body.clientHeight - 83;
+                                expresso_local_messages.set_as_logged(account_id,0,true);
+                                target.innerHTML = "<iframe src='offline.php?inside=1' width='100%' height='100%' frameBorder='0'></iframe>";
+                                return false;
+                        }
+                }
+                expresso.connector.newRequest('error.html', URL_SERVER + '/expressoMail1_2/templates/'+template+'/error.html', 'GET',
                                 function(data)
                                 {
-                                        var target = document.getElementById('divAppbox');
-                                        if ( target )
-                                                target.innerHTML = data;
+                                var target = document.getElementById('divAppbox');
+                                if ( target )
+                                target.innerHTML = data;
                                 }
-                        );
-                        return false;
-                }
-
-                draw_tree_folders(data);
-                if(data) {
-                        build_quota(data);                      
-                        var f_unseen = Element('dftree_'+current_folder+'_unseen');
-                        if(f_unseen && f_unseen.innerHTML)
-                                Element('new_m').innerHTML = '<font face="Verdana" size="1" color="RED">'+f_unseen.innerHTML+'</font>';
-                        else
-                        {
-                                if( parseInt(Element('new_m').innerHTML) == 0 )
-                                        Element('new_m').innerHTML = 0;                 
-                        }
-                        folders = data;
-                }
+                                );
+                return false;
+        }
+
+        draw_tree_folders(data);
+        if(data) {
+                build_quota(data);                      
+                var f_unseen = Element('dftree_'+current_folder+'_unseen');
+                if(f_unseen && f_unseen.innerHTML)
+                        Element('new_m').innerHTML = '<font face="Verdana" size="1" color="RED">'+f_unseen.innerHTML+'</font>';
+                else
+                {
+                        if( parseInt(Element('new_m').innerHTML) == 0 )
+                                Element('new_m').innerHTML = 0;                 
+                }
+                folders = data;
+        }
 }
 
@@ -446 +446 @@
         draw_box(data, 'INBOX', true);
         //alternate_border(0);
-}
+};
 
 // Action on change folders.
-function change_folder(folder, folder_name){
-        if (openTab.imapBox[0] != folder)
-        {
-                current_folder = folder;
-                var handler_draw_box = function(data)
-                {
+        function change_folder(folder, folder_name){
+                if (openTab.imapBox[0] != folder)
+                {
+                        current_folder = folder;
+                        var handler_draw_box = function(data)
+                        {
+                                alternate_border(0);
+                                Element("border_id_0").innerHTML = "&nbsp;" + lang_folder(folder_name) + '&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">&nbsp;</span> / <span id="tot_m"></span>]</font>';
+                                draw_box(data, folder, true);
+                                draw_paging(data.num_msgs);
+                                Element("tot_m").innerHTML = data.num_msgs;
+                                update_menu();
+                                return true;
+                        };
+                        proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort_box_type,search_box_type,sort_box_reverse,preferences.preview_msg_subject,preferences.preview_msg_tip,handler_draw_box);
+                        //              cExecute ("expressoMail1_2.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
+                }
+                else
                         alternate_border(0);
-                        Element("border_id_0").innerHTML = "&nbsp;" + lang_folder(folder_name) + '&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">&nbsp;</span> / <span id="tot_m"></span>]</font>';
-                        draw_box(data, folder, true);
-                        draw_paging(data.num_msgs);
-                        Element("tot_m").innerHTML = data.num_msgs;
-                        update_menu();
-                        return true;
-                }
-                proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort_box_type,search_box_type,sort_box_reverse,preferences.preview_msg_subject,preferences.preview_msg_tip,handler_draw_box);
-//              cExecute ("expressoMail1_2.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
-        }
-        else
-                alternate_border(0);
-}
+        }
 
 function open_folder(folder, folder_name){
@@ -479 +479 @@
                         alternate_border(numBox);
                         return true;
-                }
+                };
                 cExecute ("expressoMail1_2.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
         }
@@ -498 +498 @@
                 current_page = 1;
                 last_folder = current_folder;
-        }
+        }
 
         if(num_msgs > parseInt(preferences.max_email_per_page)) {       
@@ -512 +512 @@
                 return;
         }
-        
-        span_paging = document.getElementById("span_paging");
+
+        span_paging = document.getElementById("span_paging");
         if(!span_paging){
                 span_paging = document.createElement("DIV");
@@ -522 +522 @@
         }
         span_paging.style.width="100%";                                 
-        span_paging.innerHTML="";
-        msg_range_begin = 1;
+        span_paging.innerHTML="";
+        msg_range_begin = 1;
         msg_range_end = preferences.max_email_per_page;
-        if(current_page != 1) {
-                lnk_page = document.createElement("A");
+        if(current_page != 1) {
+                lnk_page = document.createElement("A");
                 lnk_page.setAttribute("href", "javascript:current_page=1;kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+","+preferences.preview_msg_subject+","+preferences.preview_msg_tip+",function handler(data){draw_box(data, get_current_folder());});");
-        }
-        else {
-                lnk_page = document.createElement("SPAN");
-        }
-        span_paging.appendChild(lnk_page);
-
-        lnk_page.innerHTML = "&lt;&lt;";
+        }
+        else {
+                lnk_page = document.createElement("SPAN");
+        }
+        span_paging.appendChild(lnk_page);
+
+        lnk_page.innerHTML = "&lt;&lt;";
         lnk_page.title = get_lang("First");
-        span_paging.innerHTML += "&nbsp;";
-                
-        if(current_page == lastPage + numPages)
-                lastPage = current_page - 1;            
-        else if((lastPage != 1 && lastPage == current_page) || current_page == total_pages)             
-                lastPage = current_page - (numPages - 1);
-        else if(current_page == 1)
-                lastPage = 1;
+        span_paging.innerHTML += "&nbsp;";
+
+        if(current_page == lastPage + numPages)
+                lastPage = current_page - 1;            
+        else if((lastPage != 1 && lastPage == current_page) || current_page == total_pages)             
+                lastPage = current_page - (numPages - 1);
+        else if(current_page == 1)
+                lastPage = 1;
 
         if(lastPage < 1)
@@ -552 +552 @@
         var     hasMarked = false;
 
-        for(i = lastPage; i <= total_pages; i++) {
-                        
-                if(current_page == i || (i == total_pages && !hasMarked)) {                     
-                        lnk_page = document.createElement("SPAN");
-                        span_paging.appendChild(lnk_page);
-                        lnk_page.innerHTML = "&nbsp;<b>"+i+"</b>&nbsp;";
-                        hasMarked = true;
-                        continue;
-                }
-                else{                   
-                        lnk_page = document.createElement("A");
-                        span_paging.appendChild(lnk_page);
-                        msg_range_begin = ((i*preferences.max_email_per_page)-(preferences.max_email_per_page-1));
+        for(i = lastPage; i <= total_pages; i++) {
+
+                if(current_page == i || (i == total_pages && !hasMarked)) {                     
+                        lnk_page = document.createElement("SPAN");
+                        span_paging.appendChild(lnk_page);
+                        lnk_page.innerHTML = "&nbsp;<b>"+i+"</b>&nbsp;";
+                        hasMarked = true;
+                        continue;
+                }
+                else{                   
+                        lnk_page = document.createElement("A");
+                        span_paging.appendChild(lnk_page);
+                        msg_range_begin = ((i*preferences.max_email_per_page)-(preferences.max_email_per_page-1));
                         msg_range_end = (i*preferences.max_email_per_page);
                         lnk_page.setAttribute("href", "javascript:current_page="+i+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+","+preferences.preview_msg_subject+","+preferences.preview_msg_tip+",function handler(data){draw_box(data, get_current_folder());});");
-                }
-                
-                lnk_page.innerHTML = "&nbsp;...&nbsp;";
-                
-                if(i == (lastPage + numPages))
-                                break;                  
-                else if(lastPage == 1 || i != lastPage)                                                 
-                        lnk_page.innerHTML = "&nbsp;"+i+"&nbsp;";
-                
-                span_paging.innerHTML += "&nbsp;";                                                                                                                                                                      
-        }
-        
-        if(current_page != total_pages) {
-                lnk_page = document.createElement("A");
-                msg_range_begin = ((total_pages*preferences.max_email_per_page)-(preferences.max_email_per_page-1));
+                }
+
+                lnk_page.innerHTML = "&nbsp;...&nbsp;";
+
+                if(i == (lastPage + numPages))
+                        break;                  
+                else if(lastPage == 1 || i != lastPage)                                                 
+                        lnk_page.innerHTML = "&nbsp;"+i+"&nbsp;";
+
+                span_paging.innerHTML += "&nbsp;";                                                                                                                                                                      
+        }
+
+        if(current_page != total_pages) {
+                lnk_page = document.createElement("A");
+                msg_range_begin = ((total_pages*preferences.max_email_per_page)-(preferences.max_email_per_page-1));
                 msg_range_end = (total_pages*preferences.max_email_per_page);           
                 lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+","+preferences.preview_msg_subject+","+preferences.preview_msg_tip+",function handler(data){draw_box(data, get_current_folder());});");
@@ -588 +588 @@
                 lnk_page = document.createElement("SPAN");
         }
-        span_paging.innerHTML += "&nbsp;";
-        span_paging.appendChild(lnk_page);
+        span_paging.innerHTML += "&nbsp;";
+        span_paging.appendChild(lnk_page);
 
         lnk_page.title = get_lang("Last");
-        lnk_page.innerHTML = "&gt;&gt;";
+        lnk_page.innerHTML = "&gt;&gt;";
 }
 
 
 // Draw the inbox and another folders
-function draw_box(headers_msgs, msg_folder, alternate){
-        if (alternate)
-                kill_current_box();
-        
-        if(is_ie)
-                document.getElementById("border_table").width = "99.5%";
-
-        openTab.content_id[numBox] = document.getElementById("content_id_"+numBox);     
-        openTab.imapBox[numBox] = msg_folder;
-        openTab.type[numBox] = 0;
-        
-        table_message_header_box = document.getElementById("table_message_header_box_"+numBox);
-        if (table_message_header_box == null){
+        function draw_box(headers_msgs, msg_folder, alternate){
+                if (alternate)
+                        kill_current_box();
+
+                if(is_ie)
+                        document.getElementById("border_table").width = "99.5%";
+
+                openTab.content_id[numBox] = document.getElementById("content_id_"+numBox);     
+                openTab.imapBox[numBox] = msg_folder;
+                openTab.type[numBox] = 0;
+
+                table_message_header_box = document.getElementById("table_message_header_box_"+numBox);
+                if (table_message_header_box == null){
+                        var table_element = document.createElement("TABLE");
+                        var tbody_element = document.createElement("TBODY");
+                        table_element.setAttribute("id", "table_message_header_box_"+numBox);
+                        table_element.className = "table_message_header_box";
+
+                        tr_element = document.createElement("TR");
+                        tr_element.className = "message_header";
+                        td_element1 = document.createElement("TD");
+                        td_element1.setAttribute("width", "1%");
+                        chk_box_element = document.createElement("INPUT");
+                        chk_box_element.id  = "chk_box_select_all_messages";
+                        chk_box_element.setAttribute("type", "checkbox");
+                        chk_box_element.className = "checkbox";
+                        chk_box_element.onclick = function(){select_all_messages(this.checked);};
+                        chk_box_element.onmouseover = function () {this.title=get_lang('Select all messages.');};
+                        chk_box_element.onkeydown = function (e){
+                                if (is_ie)
+                                {
+                                        if ((window.event.keyCode) == 46)
+                                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                }
+                                else
+                                {
+                                        if ((e.keyCode) == 46)
+                                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                }
+                        };
+
+                        td_element1.appendChild(chk_box_element);
+
+                        td_element2 = document.createElement("TD");
+                        td_element2.setAttribute("width", "7%");
+                        td_element3 = document.createElement("TD");
+                        td_element3.setAttribute("width", "29%");
+                        td_element3.onclick = function () {sort_box(search_box_type,'SORTFROM');};
+                        td_element3.id = "message_header_SORTFROM_"+numBox;
+                        td_element3.align = "left";
+                        td_element3.innerHTML = get_lang("Who");
+
+                        td_element4 = document.createElement("TD");
+                        td_element4.setAttribute("width", "38%");
+                        td_element4.onclick = function () {sort_box(search_box_type,'SORTSUBJECT');};
+                        td_element4.id = "message_header_SORTSUBJECT_"+numBox;
+                        td_element4.align = "left";
+                        td_element4.innerHTML = get_lang("Subject");
+
+                        td_element5 = document.createElement("TD");
+                        td_element5.setAttribute("width", "14%");
+                        td_element5.onclick = function () {sort_box(search_box_type,'SORTARRIVAL');};
+                        td_element5.id = "message_header_SORTARRIVAL_"+numBox;
+                        td_element5.align = "center";
+                        td_element5.innerHTML = get_lang("Date");
+                        td_element6 = document.createElement("TD");
+                        td_element6.setAttribute("width", "14%");
+                        td_element6.onclick = function () {sort_box(search_box_type,'SORTSIZE');};
+                        td_element6.id = "message_header_SORTSIZE_"+numBox;
+                        td_element6.align = "left";
+                        td_element6.innerHTML = get_lang("Size");
+
+                        tr_element.appendChild(td_element1);
+                        tr_element.appendChild(td_element2);            
+                        var td_element21 = document.createElement("TD");
+                        td_element21.innerHTML = "&nbsp;&nbsp;&nbsp;";
+                        var td_element22 = document.createElement("TD");
+                        td_element22.innerHTML = "&nbsp;&nbsp;&nbsp;";
+                        var td_element23 = document.createElement("TD");
+                        td_element23.innerHTML = "&nbsp;&nbsp;";
+                        tr_element.appendChild(td_element21);
+                        tr_element.appendChild(td_element22);
+                        tr_element.appendChild(td_element23);
+                        tr_element.appendChild(td_element3);
+                        tr_element.appendChild(td_element4);
+                        tr_element.appendChild(td_element5);
+                        tr_element.appendChild(td_element6);
+                        tbody_element.appendChild(tr_element);
+                        table_element.appendChild(tbody_element);
+                        openTab.content_id[numBox].appendChild(table_element);
+                }
+                draw_header_box();
                 var table_element = document.createElement("TABLE");
-                var tbody_element = document.createElement("TBODY");
-                table_element.setAttribute("id", "table_message_header_box_"+numBox);
-                table_element.className = "table_message_header_box";
-                
-                tr_element = document.createElement("TR");
-                tr_element.className = "message_header";
-                td_element1 = document.createElement("TD");
-                td_element1.setAttribute("width", "1%");
-                chk_box_element = document.createElement("INPUT");
-                chk_box_element.id  = "chk_box_select_all_messages";
-                chk_box_element.setAttribute("type", "checkbox");
-                chk_box_element.className = "checkbox";
-                chk_box_element.onclick = function(){select_all_messages(this.checked);};
-                chk_box_element.onmouseover = function () {this.title=get_lang('Select all messages.')};
-                chk_box_element.onkeydown = function (e){
+                var tbody_element = document.createElement("TBODY");    
+                table_element.id = "table_box";
+                table_element.className = "table_box";
+                table_element.borderColorDark = "#bbbbbb";
+                table_element.frame = "void";
+                table_element.rules = "rows";
+                table_element.cellPadding = "0";
+                table_element.cellSpacing = "0";
+
+                table_element.onkeydown = function (e){
                         if (is_ie)
                         {
                                 if ((window.event.keyCode) == 46)
+                                {
+                                        //delete_all_selected_msgs_imap();
                                         proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                }
                         }
                         else
                         {
                                 if ((e.keyCode) == 46)
+                                {
+                                        //delete_all_selected_msgs_imap();
                                         proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                }
                         }
                 };
-                
-                td_element1.appendChild(chk_box_element);
-                
-                td_element2 = document.createElement("TD");
-                td_element2.setAttribute("width", "7%");
-                td_element3 = document.createElement("TD");
-                td_element3.setAttribute("width", "29%");
-                td_element3.onclick = function () {sort_box(search_box_type,'SORTFROM');};
-                td_element3.id = "message_header_SORTFROM_"+numBox;
-                td_element3.align = "left";
-                td_element3.innerHTML = get_lang("Who");
-                
-                td_element4 = document.createElement("TD");
-                td_element4.setAttribute("width", "38%");
-                td_element4.onclick = function () {sort_box(search_box_type,'SORTSUBJECT');};
-                td_element4.id = "message_header_SORTSUBJECT_"+numBox;
-                td_element4.align = "left";
-                td_element4.innerHTML = get_lang("Subject");
-        
-                td_element5 = document.createElement("TD");
-                td_element5.setAttribute("width", "14%");
-                td_element5.onclick = function () {sort_box(search_box_type,'SORTARRIVAL');};
-                td_element5.id = "message_header_SORTARRIVAL_"+numBox;
-                td_element5.align = "center";
-                td_element5.innerHTML = get_lang("Date");
-                td_element6 = document.createElement("TD");
-                td_element6.setAttribute("width", "14%");
-                td_element6.onclick = function () {sort_box(search_box_type,'SORTSIZE');}
-                td_element6.id = "message_header_SORTSIZE_"+numBox;
-                td_element6.align = "left";
-                td_element6.innerHTML = get_lang("Size");
-                
-                tr_element.appendChild(td_element1);
-                tr_element.appendChild(td_element2);            
-                var td_element21 = document.createElement("TD");
-                td_element21.innerHTML = "&nbsp;&nbsp;&nbsp;";
-                var td_element22 = document.createElement("TD");
-                td_element22.innerHTML = "&nbsp;&nbsp;&nbsp;";
-                var td_element23 = document.createElement("TD");
-                td_element23.innerHTML = "&nbsp;&nbsp;";
-                tr_element.appendChild(td_element21);
-                tr_element.appendChild(td_element22);
-                tr_element.appendChild(td_element23);
-                tr_element.appendChild(td_element3);
-                tr_element.appendChild(td_element4);
-                tr_element.appendChild(td_element5);
-                tr_element.appendChild(td_element6);
-                tbody_element.appendChild(tr_element);
+                if (is_ie)
+                        table_element.style.cursor = "hand";
+
+                tbody_element.setAttribute("id", "tbody_box");
                 table_element.appendChild(tbody_element);
-                openTab.content_id[numBox].appendChild(table_element);
-        }
-        draw_header_box();
-        var table_element = document.createElement("TABLE");
-        var tbody_element = document.createElement("TBODY");    
-        table_element.id = "table_box";
-        table_element.className = "table_box";
-        table_element.borderColorDark = "#bbbbbb";
-        table_element.frame = "void";
-        table_element.rules = "rows";
-        table_element.cellPadding = "0";
-        table_element.cellSpacing = "0";
-        
-        table_element.onkeydown = function (e){
-                if (is_ie)
-                {
-                        if ((window.event.keyCode) == 46)
-                        {
-                                //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
-                        }
-                }
-                else
-                {
-                        if ((e.keyCode) == 46)
-                        {
-                                //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
-                        }
-                }
-        };
-        if (is_ie)
-                table_element.style.cursor = "hand";
-        
-        tbody_element.setAttribute("id", "tbody_box");
-        table_element.appendChild(tbody_element);
-        
-        var _divScroll = document.getElementById("divScrollMain_"+numBox);
-
-        var bar = document.getElementById("toolbar");
-        var offset = 0;
-
-        if(!_divScroll){                
-                _divScroll = document.createElement("DIV");
-                _divScroll.id = "divScrollMain_"+numBox;
-        }
-        
-        _divScroll.style.overflowY = "auto";                                                            
-        _divScroll.style.overflowX = "hidden";
-        _divScroll.style.width  ="100%";
-        
-        if (is_mozilla){
-                _divScroll.style.overflow = "-moz-scrollbars-vertical";
-                _divScroll.style.width  ="99.3%";
-        }
-        // Inicio: Redimensiona DIV SCROLL
-        var bar = Element("toolbar");
-        var offset = 0;
-        if(bar.style.visibility != 'hidden') 
-                offset = (bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight);             
-        var screenHeight = document.body.clientHeight ? document.body.clientHeight : document.body.offsetHeight;
-        var defaultHeight = screenHeight - offset;              
-        _divScroll.style.height         = defaultHeight - 110;
-        Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150);
-        // Fim: Redimensiona DIV SCROLL
-        _divScroll.appendChild(table_element);
-        openTab.content_id[numBox].appendChild(_divScroll);
-        
-        var f_unseen = 0;
+
+                var _divScroll = document.getElementById("divScrollMain_"+numBox);
+
+                var bar = document.getElementById("toolbar");
+                var offset = 0;
+
+                if(!_divScroll){                
+                        _divScroll = document.createElement("DIV");
+                        _divScroll.id = "divScrollMain_"+numBox;
+                }
+
+                _divScroll.style.overflowY = "auto";                                                            
+                _divScroll.style.overflowX = "hidden";
+                _divScroll.style.width  ="100%";
+
+                if (is_mozilla){
+                        _divScroll.style.overflow = "-moz-scrollbars-vertical";
+                        _divScroll.style.width  ="99.3%";
+                }
+                // Inicio: Redimensiona DIV SCROLL
+                var bar = Element("toolbar");
+                var offset = 0;
+                if(bar.style.visibility != 'hidden') 
+                        offset = (bar.offsetHeight ? bar.offsetHeight :  bar.clientHeight);             
+                var screenHeight = document.body.clientHeight ? document.body.clientHeight : document.body.offsetHeight;
+                var defaultHeight = screenHeight - offset;              
+                _divScroll.style.height         = defaultHeight - 110;
+                Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150);
+                // Fim: Redimensiona DIV SCROLL
+                _divScroll.appendChild(table_element);
+                openTab.content_id[numBox].appendChild(_divScroll);
+
+                var f_unseen = 0;
 
                 if (headers_msgs.num_msgs == 0){
@@ -770 +770 @@
                         tbody_element.appendChild(tr_info);
                 }
-        
-        
-        for (var i=0; i < headers_msgs.length; i++){
+
+
+                for (var i=0; i < headers_msgs.length; i++){
                         if ((headers_msgs[i].Unseen == 'U') || (headers_msgs[i].Recent == 'N'))
                                 f_unseen++;                             
@@ -781 +781 @@
                         }
                         _dragArea.makeDragged(tr_element, headers_msgs[i].msg_number, headers_msgs[i].subject, true);
-        }
-        
-        if ((preferences.use_shortcuts == '1') && (headers_msgs[0]))
-                select_msg(headers_msgs[0].msg_number, 'null', true);
-
-        var tdFolders  =  Element("folderscol");
-        tdFolders.style.display = preferences.hide_folders == '1'  ? "none" : "";
-        if ( !currentTab )
-                alternate_border(numBox);
-        draw_footer_box(headers_msgs.num_msgs); 
-        Element('main_table').style.display = '';
-        if(debug) {
-                var _eTime = new Date();
-                _eTime = _eTime.getTime();
-                alert("Carregou em "+(_eTime - _bTime)+" ms");
-        }
-        var msg_folder = Element('msg_folder').value;
-        var msg_number = Element('msg_number').value;   
-        if(!msg_folder && msg_number) {
-                new_message('new','null');
-        }
-        else if(msg_folder && msg_number){
-                expresso.connector.cacheNextRequest();
-                cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), show_msg);
-                Element('msg_folder').value = '';
-                Element('msg_number').value = '';
-        }
-
-        if(!is_ie) {
-                var scripts = new Array("jscode/ccQuickAdd",
-                                                        "jscode/color_palette",
-                                                        "jscode/filter",
-                                                        "jscode/filters",
-                                                        "jscode/html2xhtml",
-                                                        "jscode/preferences",
-                                                        "jscode/QuickCatalogSearch",
-                                                        "jscode/QuickSearchUser",
-                                                        "jscode/rich_text_editor",
-                                                        "jscode/sharemailbox",
-                                                        "jscode/search",
-                                                        "jscode/TreeS",
-                                                        "jscode/TreeShow");
-                                                        
-                expresso.connector.loadAllScripts(scripts);
-        }
-        // Loading Quota View Folder Component (if exists...)
-        if(Element("table_quota"))
-                expresso.connector.loadScript("jscode/InfoQuota");      
-}
+                }
+
+                if ((preferences.use_shortcuts == '1') && (headers_msgs[0]))
+                        select_msg(headers_msgs[0].msg_number, 'null', true);
+
+                var tdFolders  =  Element("folderscol");
+                tdFolders.style.display = preferences.hide_folders == '1'  ? "none" : "";
+                if ( !currentTab )
+                        alternate_border(numBox);
+                draw_footer_box(headers_msgs.num_msgs); 
+                Element('main_table').style.display = '';
+                if(debug) {
+                        var _eTime = new Date();
+                        _eTime = _eTime.getTime();
+                        alert("Carregou em "+(_eTime - _bTime)+" ms");
+                }
+                var msg_folder = Element('msg_folder').value;
+                var msg_number = Element('msg_number').value;   
+                if(!msg_folder && msg_number) {
+                        new_message('new','null');
+                }
+                else if(msg_folder && msg_number){
+                        expresso.connector.cacheNextRequest();
+                        cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), show_msg);
+                        Element('msg_folder').value = '';
+                        Element('msg_number').value = '';
+                }
+
+                if(!is_ie) {
+                        var scripts = new Array("jscode/ccQuickAdd",
+                                        "jscode/color_palette",
+                                        "jscode/filter",
+                                        "jscode/filters",
+                                        "jscode/html2xhtml",
+                                        "jscode/preferences",
+                                        "jscode/QuickCatalogSearch",
+                                        "jscode/QuickSearchUser",
+                                        "jscode/rich_text_editor",
+                                        "jscode/sharemailbox",
+                                        "jscode/search",
+                                        "jscode/TreeS",
+                                        "jscode/TreeShow");
+
+                        expresso.connector.loadAllScripts(scripts);
+                }
+                // Loading Quota View Folder Component (if exists...)
+                if(Element("table_quota"))
+                        expresso.connector.loadScript("jscode/InfoQuota");      
+        }
 
 function make_tr_message(headers_msgs, msg_folder){
-                var tr_element = document.createElement('tr');
-                tr_element.style.height = preferences.line_height;              
-                tr_element.id = headers_msgs.msg_number;
-
-                tr_element.msg_sample = "";
-                //if(headers_msgs.msg_sample && headers_msgs.msg_sample.preview_msg_subject != "")
-                if(headers_msgs.msg_sample && preferences.preview_msg_subject == "1")
-                {
-                        tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,120) + "..."; //trecho do body que sera exibido com o assunto;
-                }
-
-                tr_element.tip = "";
-                if(headers_msgs.msg_sample && preferences.preview_msg_tip == "1")
-                {
-                        tr_element.tip = headers_msgs.msg_sample.body.substr(3,300) + "..."; //trecho do body que sera exibido no tool-tip;
-                }
-
-                if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N')){
-                        if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 && parseInt(preferences.use_important_flag)))
-                                add_className(tr_element, 'flagged_msg');
-                        add_className(tr_element, 'tr_msg_unread');
-                }
-                else{
-                        if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 && parseInt(preferences.use_important_flag)))
-                                add_className(tr_element,'flagged_msg');
-                }
-
-                if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N'))
-                        add_className(tr_element, 'tr_msg_unread');
-                
-                if (headers_msgs.Flagged == 'F')
+        var tr_element = document.createElement('tr');
+        tr_element.style.height = preferences.line_height;              
+        tr_element.id = headers_msgs.msg_number;
+
+        tr_element.msg_sample = "";
+        //if(headers_msgs.msg_sample && headers_msgs.msg_sample.preview_msg_subject != "")
+        if(headers_msgs.msg_sample && preferences.preview_msg_subject == "1")
+        {
+                tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,120) + "..."; //trecho do body que sera exibido com o assunto;
+        }
+
+        tr_element.tip = "";
+        if(headers_msgs.msg_sample && preferences.preview_msg_tip == "1")
+        {
+                tr_element.tip = headers_msgs.msg_sample.body.substr(3,300) + "..."; //trecho do body que sera exibido no tool-tip;
+        }
+
+        if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N')){
+                if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 && parseInt(preferences.use_important_flag)))
+                        add_className(tr_element, 'flagged_msg');
+                add_className(tr_element, 'tr_msg_unread');
+        }
+        else{
+                if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 && parseInt(preferences.use_important_flag)))
                         add_className(tr_element,'flagged_msg');
-
-                td_element1 = document.createElement("TD");
-                td_element1.className = "td_msg";
-                td_element1.setAttribute("width", "1%");
-                chk_box_element = document.createElement("INPUT");
-                chk_box_element.setAttribute("type", "checkbox");
-                chk_box_element.className = "checkbox";
-                chk_box_element.setAttribute("id", "check_box_message_"+headers_msgs.msg_number);
-                chk_box_element.onclick = function(e){
-                        if (is_ie)
-                                changeBgColor(window.event,headers_msgs.msg_number);
-                        else
-                                changeBgColor(e,headers_msgs.msg_number);
-                };
-                td_element1.appendChild(chk_box_element);
-                
-                td_element2 = document.createElement("TD");
-                td_element2.className = "td_msg";
-                td_element2.setAttribute("width", "2%");
-                if (headers_msgs.attachment && headers_msgs.attachment.number_attachments > 0)
-                        td_element2.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/clip.gif" title="' + url_decode(headers_msgs.attachment.names) + '">';                     
-                        
-                td_element21 = document.createElement("TD");
-                td_element21.className = "td_msg";
-                td_element21.setAttribute("width", "1%");
-                td_element21.id = "td_message_answered_"+headers_msgs.msg_number;
-
-                if (headers_msgs.attachment && headers_msgs.attachment.number_attachments > 0) {
-                        attach_name = headers_msgs.attachment.names.split(", ");
-                        for(var item in attach_name)
-                        {
-                                if (url_decode(attach_name[item]) != 'smime.p7s' && url_decode(attach_name[item]) != 'smime.p7m'){
-                                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/clip.gif" title="' + url_decode(attach_name[item]) + '">';
-                                        break;
-                                }
-                        }
-                }
-
-                if ((headers_msgs.Forwarded == 'F')  || (headers_msgs.Draft == 'X' && headers_msgs.Answered == 'A')){
-                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/forwarded.gif" title="'+get_lang('Forwarded')+'">';
-                        headers_msgs.Draft = '' 
-                        headers_msgs.Answered = '';
-                        headers_msgs.Forwarded = 'F';
-                }
-                else if (headers_msgs.Draft == 'X')
-                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/draft.gif" title="'+get_lang('Draft')+'">';
-                else if (headers_msgs.Answered == 'A')
-                        td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/answered.gif" title="'+get_lang('Answered')+'">';
+        }
+
+        if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N'))
+                add_className(tr_element, 'tr_msg_unread');
+
+        if (headers_msgs.Flagged == 'F')
+                add_className(tr_element,'flagged_msg');
+
+        td_element1 = document.createElement("TD");
+        td_element1.className = "td_msg";
+        td_element1.setAttribute("width", "1%");
+        chk_box_element = document.createElement("INPUT");
+        chk_box_element.setAttribute("type", "checkbox");
+        chk_box_element.className = "checkbox";
+        chk_box_element.setAttribute("id", "check_box_message_"+headers_msgs.msg_number);
+        chk_box_element.onclick = function(e){
+                if (is_ie)
+                        changeBgColor(window.event,headers_msgs.msg_number);
                 else
-                        td_element21.innerHTML = "&nbsp;&nbsp;&nbsp;";
-
-                td_element22 = document.createElement("TD");
-                td_element22.className = "td_msg";
-                td_element22.setAttribute("width", "1%");
-                td_element22.id = "td_message_signed_"+headers_msgs.msg_number;
-
-        //td_element23 = document.createElement("TD");
-                //td_element23.setAttribute("width", "1%");
-                //td_element23.id = "td_message_signed_"+headers_msgs.msg_number;
-        switch(headers_msgs.ContentType)
-                {
-            case "signature":
-                        {
-                                td_element22.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_msg.gif" title="' + get_lang('Signed message') + '">';
+                        changeBgColor(e,headers_msgs.msg_number);
+        };
+        td_element1.appendChild(chk_box_element);
+
+        td_element2 = document.createElement("TD");
+        td_element2.className = "td_msg";
+        td_element2.setAttribute("width", "2%");
+        if (headers_msgs.attachment && headers_msgs.attachment.number_attachments > 0)
+                td_element2.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/clip.gif" title="' + url_decode(headers_msgs.attachment.names) + '">';                     
+
+        td_element21 = document.createElement("TD");
+        td_element21.className = "td_msg";
+        td_element21.setAttribute("width", "1%");
+        td_element21.id = "td_message_answered_"+headers_msgs.msg_number;
+
+        if (headers_msgs.attachment && headers_msgs.attachment.number_attachments > 0) {
+                attach_name = headers_msgs.attachment.names.split(", ");
+                for(var item in attach_name)
+                {
+                        if (url_decode(attach_name[item]) != 'smime.p7s' && url_decode(attach_name[item]) != 'smime.p7m'){
+                                td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/clip.gif" title="' + url_decode(attach_name[item]) + '">';
                                 break;
                         }
-            case "cipher":
-                        {
-                                td_element22.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/lock.gif" title="' + get_lang('Crypted message') + '">';
-                                break;
-                        }
-            default:
-                        {
-                                break;
-                        }
-                }
-
-        td_element23 = document.createElement("TD");
-                td_element23.className = "td_msg"
-                td_element23.setAttribute("width", "1%");
-                td_element23.id = "td_message_important_"+headers_msgs.msg_number;
-
-                if (headers_msgs.Flagged == 'F' || (headers_msgs.Importance.toLowerCase().indexOf("high") != -1 && parseInt(preferences.use_important_flag)))
-                {
-                        td_element23.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/important.gif" title="'+get_lang('Important')+'">';
-                }
-                else
-                        td_element23.innerHTML = "&nbsp;&nbsp;&nbsp;";
-
-                td_element24 = document.createElement("TD");
-                td_element24.className = "td_msg";
-                td_element24.setAttribute("width", "1%");
-                td_element24.id = "td_message_sent_"+headers_msgs.msg_number;
-                td_element24.innerHTML = "&nbsp;&nbsp;&nbsp;";
-                // preload image
-                var _img_sent = new Image();
-                _img_sent.src    = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/sent.gif';
-
-                td_element3 = document.createElement("TD");
-                td_element3.className = "td_msg";
-                td_element3.id = "td_who_"+ headers_msgs.msg_number;
-                td_element3.setAttribute("width", "20%");
-                var _onclick = function(){InfoContact.hide();proxy_mensagens.get_msg(headers_msgs.msg_number, msg_folder,true, show_msg);};
-                td_element3.onclick = _onclick;
-                td_element3.innerHTML = '&nbsp;';
-                
-                if (typeof(headers_msgs.from) == 'undefined')
-                        return false;
-                if(headers_msgs.from.email.toLowerCase() == Element("user_email").value)
-                { 
-                        td_element3.onmouseover = function () {this.title=headers_msgs.to.email;};
-                        if (headers_msgs.Draft == 'X')
-                                td_element3.innerHTML += "<span style=\"color:red\">("+get_lang("Draft")+") </span>";
-                        else{                           
-                                if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)
-                                        td_element24.innerHTML = '<img valign="center" src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/sent.gif" title="'+get_lang('Sent')+'">';
-                        
-                                if ((headers_msgs.to)&&(headers_msgs.to.name != null))
-                                        td_element3.innerHTML += headers_msgs.to.name;
-                                else if (headers_msgs.to){
-                                        td_element3.innerHTML += headers_msgs.to.email;
-                                }
-                        }
-                }
-                else{
-                        if (headers_msgs.Draft == 'X'){
-                                td_element3.innerHTML = "<span style=\"color:red\">("+get_lang("Draft")+") </span>";
-                        }
-                        else{                           
-                                var spanSender = document.createElement("SPAN");
-                                spanSender.onmouseover = function (event) {this.style.textDecoration = "underline";try {InfoContact.begin(this,headers_msgs.from.email)} catch(e){};};
-                                spanSender.onmouseout = function (){ try {this.style.textDecoration = "none"; clearTimeout(InfoContact.timeout);} catch(e){}};
-                                spanSender.innerHTML =  headers_msgs.from.name != null ? headers_msgs.from.name : headers_msgs.from.email;
-                                if (spanSender.innerHTML.indexOf(" ") == '-1' && spanSender.innerHTML.length > 25){
-                                        spanSender.innerHTML = spanSender.innerHTML.substring(0,25) + "...";
-                                }
-                                else if (spanSender.innerHTML.length > 40 ){
-                                        spanSender.innerHTML = spanSender.innerHTML.substring(0,40) + "...";
-                                }                               
-                                td_element3.appendChild(spanSender);                            
-                        }
-                }                       
-                td_element4 = document.createElement("TD");
-                td_element4.className = "td_msg";
-                td_element4.setAttribute("width", "50%");
-                td_element4.onclick = _onclick;
-//              td_element4.setAttribute("style","white-space:nowrap;");
-                td_element4.innerHTML = !is_ie ? "<a nowrap id='a_message_"+tr_element.id+"'>&nbsp;" : "&nbsp;";
-                
-                if ((headers_msgs.subject)&&(headers_msgs.subject.length > 50))
-                {
-//                      if( (headers_msgs.subject.length+tr_element.msg_sample.length)>
-                        td_element4.innerHTML += headers_msgs.subject.substring(0,50) + "..." + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample +"</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
-                }
-                else
-                {
-                        td_element4.innerHTML += headers_msgs.subject + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample + "</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
-                }
-                                        
-                td_element4.title=tr_element.tip;
-                if(!is_ie){
-                        td_element4.innerHTML += "</a>";
-                }
-                
-
-                td_element5 = document.createElement("TD");
-                td_element5.className = "td_msg";
-                td_element5.setAttribute("width", "14%");
-                td_element5.onclick = _onclick;
-                td_element5.setAttribute("align", "center");
-                td_element5.innerHTML = headers_msgs.udate;
-
-                td_element6 = document.createElement("TD");
-                td_element6.className = "td_msg";
-                td_element6.setAttribute("width", "14%");
-                td_element6.onclick = _onclick;
-                td_element6.setAttribute("noWrap","true");
-                td_element6.setAttribute("align", "center");
-
-                td_element6.innerHTML = borkb(headers_msgs.Size);
-
-                tr_element.appendChild(td_element1);
-                tr_element.appendChild(td_element2);
-                tr_element.appendChild(td_element21);
-                tr_element.appendChild(td_element22);
-                tr_element.appendChild(td_element23);
-        tr_element.appendChild(td_element24);
-                tr_element.appendChild(td_element3);
-                tr_element.appendChild(td_element4);
-                tr_element.appendChild(td_element5);
-                tr_element.appendChild(td_element6);
-                return tr_element;
+                }
+        }
+
+        if ((headers_msgs.Forwarded == 'F')  || (headers_msgs.Draft == 'X' && headers_msgs.Answered == 'A')){
+                td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/forwarded.gif" title="'+get_lang('Forwarded')+'">';
+                headers_msgs.Draft = '';
+                headers_msgs.Answered = '';
+                headers_msgs.Forwarded = 'F';
+        }
+        else if (headers_msgs.Draft == 'X')
+                td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/draft.gif" title="'+get_lang('Draft')+'">';
+        else if (headers_msgs.Answered == 'A')
+                td_element21.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/answered.gif" title="'+get_lang('Answered')+'">';
+        else
+                td_element21.innerHTML = "&nbsp;&nbsp;&nbsp;";
+
+        td_element22 = document.createElement("TD");
+        td_element22.className = "td_msg";
+        td_element22.setAttribute("width", "1%");
+        td_element22.id = "td_message_signed_"+headers_msgs.msg_number;
+
+        //td_element23 = document.createElement("TD");
+        //td_element23.setAttribute("width", "1%");
+        //td_element23.id = "td_message_signed_"+headers_msgs.msg_number;
+        switch(headers_msgs.ContentType)
+        {
+                case "signature":
+                {
+                        td_element22.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_msg.gif" title="' + get_lang('Signed message') + '">';
+                        break;
+                }
+                case "cipher":
+                {
+                        td_element22.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/lock.gif" title="' + get_lang('Crypted message') + '">';
+                        break;
+                }
+                default:
+                {
+                        break;
+                }
+        };
+
+        td_element23 = document.createElement("TD");
+        td_element23.className = "td_msg";
+        td_element23.setAttribute("width", "1%");
+        td_element23.id = "td_message_important_"+headers_msgs.msg_number;
+
+        if (headers_msgs.Flagged == 'F' || (headers_msgs.Importance.toLowerCase().indexOf("high") != -1 && parseInt(preferences.use_important_flag)))
+        {
+                td_element23.innerHTML = '<img src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/important.gif" title="'+get_lang('Important')+'">';
+        }
+        else
+                td_element23.innerHTML = "&nbsp;&nbsp;&nbsp;";
+
+        td_element24 = document.createElement("TD");
+        td_element24.className = "td_msg";
+        td_element24.setAttribute("width", "1%");
+        td_element24.id = "td_message_sent_"+headers_msgs.msg_number;
+        td_element24.innerHTML = "&nbsp;&nbsp;&nbsp;";
+        // preload image
+        var _img_sent = new Image();
+        _img_sent.src    = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/sent.gif';
+
+        td_element3 = document.createElement("TD");
+        td_element3.className = "td_msg";
+        td_element3.id = "td_who_"+ headers_msgs.msg_number;
+        td_element3.setAttribute("width", "20%");
+        var _onclick = function(){InfoContact.hide();proxy_mensagens.get_msg(headers_msgs.msg_number, msg_folder,true, show_msg);};
+        td_element3.onclick = _onclick;
+        td_element3.innerHTML = '&nbsp;';
+
+        if (typeof(headers_msgs.from) == 'undefined')
+                return false;
+        if(headers_msgs.from.email.toLowerCase() == Element("user_email").value)
+        { 
+                td_element3.onmouseover = function () {this.title=headers_msgs.to.email;};
+                if (headers_msgs.Draft == 'X')
+                        td_element3.innerHTML += "<span style=\"color:red\">("+get_lang("Draft")+") </span>";
+                else{                           
+                        if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)
+                                td_element24.innerHTML = '<img valign="center" src ="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/sent.gif" title="'+get_lang('Sent')+'">';
+
+                        if ((headers_msgs.to)&&(headers_msgs.to.name != null))
+                                td_element3.innerHTML += headers_msgs.to.name;
+                        else if (headers_msgs.to){
+                                td_element3.innerHTML += headers_msgs.to.email;
+                        }
+                }
+        }
+        else{
+                if (headers_msgs.Draft == 'X'){
+                        td_element3.innerHTML = "<span style=\"color:red\">("+get_lang("Draft")+") </span>";
+                }
+                else{                           
+                        var spanSender = document.createElement("SPAN");
+                        spanSender.onmouseover = function (event) {this.style.textDecoration = "underline";try {InfoContact.begin(this,headers_msgs.from.email)} catch(e){};};
+                        spanSender.onmouseout = function (){ try {this.style.textDecoration = "none"; clearTimeout(InfoContact.timeout);} catch(e){}};
+                        spanSender.innerHTML =  headers_msgs.from.name != null ? headers_msgs.from.name : headers_msgs.from.email;
+                        if (spanSender.innerHTML.indexOf(" ") == '-1' && spanSender.innerHTML.length > 25){
+                                spanSender.innerHTML = spanSender.innerHTML.substring(0,25) + "...";
+                        }
+                        else if (spanSender.innerHTML.length > 40 ){
+                                spanSender.innerHTML = spanSender.innerHTML.substring(0,40) + "...";
+                        }                               
+                        td_element3.appendChild(spanSender);                            
+                }
+        }                       
+        td_element4 = document.createElement("TD");
+        td_element4.className = "td_msg";
+        td_element4.setAttribute("width", "50%");
+        td_element4.onclick = _onclick;
+        //              td_element4.setAttribute("style","white-space:nowrap;");
+        td_element4.innerHTML = !is_ie ? "<a nowrap id='a_message_"+tr_element.id+"'>&nbsp;" : "&nbsp;";
+
+        if ((headers_msgs.subject)&&(headers_msgs.subject.length > 50))
+        {
+                //                      if( (headers_msgs.subject.length+tr_element.msg_sample.length)>
+                td_element4.innerHTML += headers_msgs.subject.substring(0,50) + "..." + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample +"</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
+        }
+        else
+        {
+                td_element4.innerHTML += headers_msgs.subject + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample + "</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
+        }
+
+        td_element4.title=tr_element.tip;
+        if(!is_ie){
+                td_element4.innerHTML += "</a>";
+        }
+
+
+        td_element5 = document.createElement("TD");
+        td_element5.className = "td_msg";
+        td_element5.setAttribute("width", "14%");
+        td_element5.onclick = _onclick;
+        td_element5.setAttribute("align", "center");
+        td_element5.innerHTML = headers_msgs.udate;
+
+        td_element6 = document.createElement("TD");
+        td_element6.className = "td_msg";
+        td_element6.setAttribute("width", "14%");
+        td_element6.onclick = _onclick;
+        td_element6.setAttribute("noWrap","true");
+        td_element6.setAttribute("align", "center");
+
+        td_element6.innerHTML = borkb(headers_msgs.Size);
+
+        tr_element.appendChild(td_element1);
+        tr_element.appendChild(td_element2);
+        tr_element.appendChild(td_element21);
+        tr_element.appendChild(td_element22);
+        tr_element.appendChild(td_element23);
+        tr_element.appendChild(td_element24);
+        tr_element.appendChild(td_element3);
+        tr_element.appendChild(td_element4);
+        tr_element.appendChild(td_element5);
+        tr_element.appendChild(td_element6);
+        return tr_element;
 }
 
@@ -1064 +1064 @@
                 draw_paging(Element('tot_m').innerHTML);
                 //Mostrar as msgs nao lidas de acordo com o filtro de relevancia
-                var msgs_unseen = 0;
-                for(i in data){
-                        if(data[i].Unseen == 'U')
-                                msgs_unseen++;
-        }
+                var msgs_unseen = 0;
+                for(i in data){
+                        if(data[i].Unseen == 'U')
+                                msgs_unseen++;
+                }
                 Element("new_m").innerHTML = '<font style="color:'+(msgs_unseen == 0 ? '': 'red')+'">' + msgs_unseen + '</font>';
-        }
+        };
 
         if(sort_box_type == sort && search_box_type == search){
@@ -1081 +1081 @@
                         sort_box_reverse = 1;
         }
-                
+
         // Global variable.
         sort_box_type = sort;
@@ -1118 +1118 @@
         var content = document.getElementById('content_id_' + ID);
         var defaultWidth = document.body.offsetWidth - 37;
-        
+
         var menuHidden = Element("folderscol").style.display == 'none' ? true : false;
         if(!menuHidden)
                 defaultWidth -= Element("folderscol").offsetWidth;
-         //////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         //Make the next/previous buttom.
         //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1137 +1137 @@
         // Old
         //img_next_msg.onclick = function () {cExecute ("expressoMail1_2.imap_functions.get_info_next_msg&msg_number="+ info_msg.msg_number + "&msg_folder="+ info_msg.msg_folder + "&sort_box_type="+ sort_box_type +  "&search_box_type="+ search_box_type +"&sort_box_reverse="+ sort_box_reverse +"&reuse_border="+ID, show_msg)};
-    var folder_id = 0;
-    folder_id = info_msg.original_ID ? info_msg.original_ID: info_msg.msg_number;
+        var folder_id = 0;
+        folder_id = info_msg.original_ID ? info_msg.original_ID: info_msg.msg_number;
         var folder = document.getElementById(folder_id);
         if (!folder){
                 delete_border(ID);
                 return;
-                }
-    if (folder){ // mensagem local criptografada nao tem ID da pasta local
-        if (folder.nextSibling){
-            var nextMsgBox = folder.nextSibling.name?folder.nextSibling.name:info_msg.msg_folder;
-
-            if (nextMsgBox == "INBOX/decifradas")// teste para ver se a mensagem vem da pasta oculta decifradas
-                    nextMsgBox = get_current_folder();
-
-            img_next_msg.onclick = function()
-            {
-                currentTab = ID;
-                openTab.type[ID] = 2;
-                            proxy_mensagens.get_msg(folder.nextSibling.id,nextMsgBox,true,show_msg);
-                //cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg);
-            };
-        }
-        else
-        {
-            img_next_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/down.gray.button.png';
-            img_next_msg.style.cursor = 'default';
-
-        }
-    }
-    else
-    {
-        img_next_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/down.gray.button.png';
+        }
+        if (folder){ // mensagem local criptografada nao tem ID da pasta local
+                if (folder.nextSibling){
+                        var nextMsgBox = folder.nextSibling.name?folder.nextSibling.name:info_msg.msg_folder;
+
+                        if (nextMsgBox == "INBOX/decifradas")// teste para ver se a mensagem vem da pasta oculta decifradas
+                                nextMsgBox = get_current_folder();
+
+                        img_next_msg.onclick = function()
+                        {
+                                currentTab = ID;
+                                openTab.type[ID] = 2;
+                                proxy_mensagens.get_msg(folder.nextSibling.id,nextMsgBox,true,show_msg);
+                                //cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg);
+                        };
+                }
+                else
+                {
+                        img_next_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/down.gray.button.png';
+                        img_next_msg.style.cursor = 'default';
+
+                }
+        }
+        else
+        {
+                img_next_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/down.gray.button.png';
                 img_next_msg.style.cursor = 'default';
                 if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local
                 {
-            img_next_msg.onclick = function()
-                {
-                    /*current_page++;
-                    msg_range_end = (current_page*preferences.max_email_per_page);
-                    msg_range_begin = (msg_range_end-(preferences.max_email_per_page)+1);
-                    kill_current_box();
-                    cExecute ('expressoMail1_2.imap_functions.get_range_msgs2&folder='+current_folder+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, current_folder);}) */
-                        delete_border(ID);
-                };
-        }
-    }
+                        img_next_msg.onclick = function()
+                        {
+                                /*current_page++;
+                                  msg_range_end = (current_page*preferences.max_email_per_page);
+                                  msg_range_begin = (msg_range_end-(preferences.max_email_per_page)+1);
+                                  kill_current_box();
+                                  cExecute ('expressoMail1_2.imap_functions.get_range_msgs2&folder='+current_folder+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, current_folder);}) */
+                                delete_border(ID);
+                        };
+                }
+        }
         var img_space = document.createElement("SPAN");
         img_space.innerHTML = "&nbsp;";
@@ -1195 +1195 @@
         //folder = document.getElementById(ID.substr(0, ID.indexOf('_')));
         if (!folder){
-                delete_border(ID);
+                delete_border(ID);
                 return;
-                }
-    if (folder){ // mensagem local criptografada nao tem ID da pasta local
-        if (folder.previousSibling)
-        {
-            var previousMsgBox = folder.previousSibling.name?folder.previousSibling.name:info_msg.msg_folder;
-
-            if (previousMsgBox == "INBOX/decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas
-                    previousMsgBox = get_current_folder();
-
-            img_previous_msg.onclick = function()
-            {
-                currentTab = ID;
-                openTab.type[ID] = 2;
-                //cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg);
-                            proxy_mensagens.get_msg(folder.previousSibling.id,previousMsgBox,true,show_msg);
-            };
-        }
-        else
-        {
-            img_previous_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/up.gray.button.png';
-            img_previous_msg.style.cursor = 'default';
-        }
+        }
+        if (folder){ // mensagem local criptografada nao tem ID da pasta local
+                if (folder.previousSibling)
+                {
+                        var previousMsgBox = folder.previousSibling.name?folder.previousSibling.name:info_msg.msg_folder;
+
+                        if (previousMsgBox == "INBOX/decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas
+                                previousMsgBox = get_current_folder();
+
+                        img_previous_msg.onclick = function()
+                        {
+                                currentTab = ID;
+                                openTab.type[ID] = 2;
+                                //cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg);
+                                proxy_mensagens.get_msg(folder.previousSibling.id,previousMsgBox,true,show_msg);
+                        };
+                }
+                else
+                {
+                        img_previous_msg.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/up.gray.button.png';
+                        img_previous_msg.style.cursor = 'default';
+                }
         }
         else
@@ -1225 +1225 @@
                 img_previous_msg.style.cursor = 'default';
                 if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local
-        {
-            img_previous_msg.onclick = function()
-            {
-                delete_border(ID);
-            };
-        }
-    }
+                {
+                        img_previous_msg.onclick = function()
+                        {
+                                delete_border(ID);
+                        };
+                }
+        }
         next_previous_msg_td.appendChild(img_previous_msg);
         next_previous_msg_td.appendChild(img_space);
@@ -1259 +1259 @@
         var _name = '';
         var _maxChar = menuHidden ? 40 : 15;
-        
+
         if (info_msg.from.name)
         {
                 var spanName = document.createElement("SPAN");
-                        spanName.innerHTML = info_msg.from.name;
+                spanName.innerHTML = info_msg.from.name;
                 _name = spanName.innerHTML.length > _maxChar ? spanName.innerHTML.substring(0,_maxChar) + "..." : spanName.innerHTML;
         }
@@ -1272 +1272 @@
         if (info_msg.attachments.length > 0)
                 td.innerHTML += "&nbsp<img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/clip.gif' title='"+info_msg.attachments.names+"'>";
-        
+
         if (typeof(info_msg.signature) == 'string')
         {       
@@ -1280 +1280 @@
                         td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/invalid.gif'>";
         }
-        
+
         if (info_msg.DispositionNotificationTo)
         {
                 td.innerHTML += '&nbsp;<img style="cursor:pointer" alt="'+ get_lang('Message with read notification') + '" title="'+ get_lang('Message with read notification') + '" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/notification.gif">';
         }
-        
+
         // NORMAL MSG
         if(info_msg.Draft != 'X')
         {
-        var options = document.createElement("TD");
-        options.width = "30%";
-        options.setAttribute("noWrap","true");
-        var option_hide_more = document.createElement("SPAN");
-        option_hide_more.className = 'message_options';
-        options.align = 'right';
-        option_hide_more.value = 'more_options';
-        option_hide_more.id = 'option_hide_more_'+ID;
-        option_hide_more.onclick = function(){
-                var _height = Element("div_message_scroll_"+ID).style.height;
-                _height = parseInt(_height.replace("px",""));
-                var _offset = 35;
-                if (this.value == 'more_options'){
-                        this.innerHTML = "<b><u>"+get_lang('Options')+"</u></b>";
-                        this.value = 'hide_options';
-                        Element("div_message_scroll_"+ID).style.height = (_height - _offset)+"px";
-                        Element('table_message_others_options_'+ID).style.display = '';
-                        Element('tr_other_options_'+ID).style.display = '';
-                        
-                }
-                else{
-                        this.innerHTML = get_lang('Options');
-                        this.value = 'more_options';
-                        Element("div_message_scroll_"+ID).style.height = (_height + _offset)+"px";
-                        Element('table_message_others_options_'+ID).style.display = 'none';
-                        Element('tr_other_options_'+ID).style.display = 'none';                 
-                }
-        };
-        var option_mark = document.createElement('TD');
-        option_mark.align = "left";
-        option_mark.width = "50%";
-
-        var option_mark_as_unseen = '<span class="message_options" onclick="\
-                changeLinkState(this,\'seen\');\
-                set_messages_flag(\'unseen\','+folder_id+');\
-                write_msg(\''+get_lang('Message marked as ')+get_lang("Unseen")+
-        '.\');">'+get_lang("Unseen")+'</span>, ';
-
-        if (info_msg.Flagged == "F")
-                var option_mark_important = '<span class="message_options" onclick="\
-                        changeLinkState(this,\'important\');\
-                        set_messages_flag(\'unflagged\','+folder_id+');\
-                        write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+
-                        '.\');">'+get_lang("Normal")+'</span>';
-        else
-                var option_mark_important = '<span class="message_options" onclick="\
-                        changeLinkState(this,\'normal\');\
-                        set_messages_flag(\'flagged\','+folder_id+');\
-                        write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+
-                        '.\');">'+get_lang("Important")+'</span>';
-        option_mark.innerHTML = option_mark_as_unseen+option_mark_important;
-        option_hide_more.innerHTML = get_lang('Options');
-        options.appendChild(option_hide_more);
-        
-        var space0 = document.createElement("SPAN");
-        space0.innerHTML = '&nbsp;|&nbsp;';
-        var space1 = document.createElement("SPAN");
-        space1.innerHTML = '&nbsp;|&nbsp;';
-        var space2 = document.createElement("SPAN");
-        space2.innerHTML = '&nbsp;|&nbsp;';
-        var space3 = document.createElement("SPAN");
-        space3.innerHTML = '&nbsp;|&nbsp;';
-        var space4 = document.createElement("SPAN");
-        space4.innerHTML = '&nbsp;|&nbsp;';
-
-        var option_forward = document.createElement("SPAN");
-        option_forward.id = 'msg_opt_forward_'+ID;
-        option_forward.className = 'message_options';
-        option_forward.onclick = function(){new_message('forward', ID);};
-        option_forward.innerHTML = get_lang('Forward');
-        options.appendChild(space1);
-        options.appendChild(option_forward);
-        var option_reply = document.createElement("SPAN");
-        option_reply.id = 'msg_opt_reply_'+ID;
-        option_reply.className = 'message_options';
-        option_reply.onclick = function(){new_message('reply_with_history', ID);};
-        option_reply.innerHTML = get_lang('Reply');
-        options.appendChild(space2);
-        options.appendChild(option_reply);
-        var option_delete = document.createElement("SPAN");
-        option_delete.id = 'msg_opt_delete_'+ID;
-        option_delete.className = 'message_options';
-        option_delete.onclick = function(){proxy_mensagens.delete_msgs(info_msg.msg_folder, info_msg.msg_number, ID);};
-        option_delete.innerHTML = get_lang('Delete');
-        options.appendChild(space3);
-        options.appendChild(option_delete);
-        
-        tr.appendChild(td);
-        tr.appendChild(option_mark);
-        tr.appendChild(options);
-        tr.appendChild(next_previous_msg_td);
-        tbody_message_options.appendChild(tr);
-        
-        ////////// OTHER OPTIONS ////////////////////
-        var tr_other_options = document.createElement("TR");
-        tr_other_options.id = 'tr_other_options_' + ID;
-        tr_other_options.style.display = 'none';
-        
-        var td_other_options = document.createElement("TD");
-        td_other_options.colSpan = '3';
-        //td_other_options.align = 'right';
-        //td_other_options.setAttribute("noWrap","true");
-        var div_other_options = document.createElement("DIV");
-
-        var option_mark_as                                              = '<span>'+get_lang("Mark as")+'</span>: ';
-        var option_mark_as_unseen                               = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unseen\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Unseen")+'.\');">'+get_lang("Unseen")+'</span>, ';
-        var option_mark_as_important                    = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'flagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+'.\');">'+get_lang("Important")+'</span>, ';
-        var option_mark_as_normal                               = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unflagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+'.\');">'+get_lang("Normal")+'</span> | ';
-        
-        var option_move                                                 = '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","move_to");>'+get_lang("Move")+'</span> | ';
-        var option_reply_to_all                                 = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_to_all_with_history","'+ID+'");>'+get_lang("Reply to all")+'</span> | ';
-        var option_reply_without_history                = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_without_history","'+ID+'");>'+get_lang("Reply without history")+'</span> | ';
-        var option_reply_to_all_without_history = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_to_all_without_history","'+ID+'");>'+get_lang("Reply to all without history")+'</span> |';
-        var option_source_msg = '<span class="message_options" onclick=proxy_mensagens.proxy_source_msg("'+ID+'","'+url_encode(info_msg.msg_folder)+'");>'+get_lang("Message Font")+'</span> </div>';           
-
-        div_other_options.innerHTML = option_reply_to_all + option_reply_without_history + option_reply_to_all_without_history + option_source_msg;
-        if (use_spam_filter) {
-                if(info_msg.msg_folder == 'INBOX'+cyrus_delimiter+'Spam')
-                        div_other_options.innerHTML += ' | <span class="message_options" onclick="nospam('+info_msg.msg_number+',\'null\', \''+info_msg.msg_folder+'\')";>'+get_lang("Not Spam")+'</span>';     
+                var options = document.createElement("TD");
+                options.width = "30%";
+                options.setAttribute("noWrap","true");
+                var option_hide_more = document.createElement("SPAN");
+                option_hide_more.className = 'message_options';
+                options.align = 'right';
+                option_hide_more.value = 'more_options';
+                option_hide_more.id = 'option_hide_more_'+ID;
+                option_hide_more.onclick = function(){
+                        var _height = Element("div_message_scroll_"+ID).style.height;
+                        _height = parseInt(_height.replace("px",""));
+                        var _offset = 35;
+                        if (this.value == 'more_options'){
+                                this.innerHTML = "<b><u>"+get_lang('Options')+"</u></b>";
+                                this.value = 'hide_options';
+                                Element("div_message_scroll_"+ID).style.height = (_height - _offset)+"px";
+                                Element('table_message_others_options_'+ID).style.display = '';
+                                Element('tr_other_options_'+ID).style.display = '';
+
+                        }
+                        else{
+                                this.innerHTML = get_lang('Options');
+                                this.value = 'more_options';
+                                Element("div_message_scroll_"+ID).style.height = (_height + _offset)+"px";
+                                Element('table_message_others_options_'+ID).style.display = 'none';
+                                Element('tr_other_options_'+ID).style.display = 'none';                 
+                        }
+                };
+                var option_mark = document.createElement('TD');
+                option_mark.align = "left";
+                option_mark.width = "50%";
+
+
+                var option_mark_as_unseen = '<span class="message_options" onclick="\
+                                            changeLinkState(this,\'seen\');\
+                                            set_messages_flag(\'unseen\','+folder_id+');\
+                                            write_msg(\''+get_lang('Message marked as ')+get_lang("Unseen")+
+                                                            '.\');">'+get_lang("Unseen")+'</span>, ';
+
+                if (info_msg.Flagged == "F")
+                        var option_mark_important = '<span class="message_options" onclick="\
+                                                    changeLinkState(this,\'important\');\
+                                                    set_messages_flag(\'unflagged\','+folder_id+');\
+                                                    write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+
+                                                                    '.\');">'+get_lang("Normal")+'</span>';
                 else
-                        div_other_options.innerHTML += ' | <span class="message_options" onclick="spam(\''+info_msg.msg_folder+'\', '+info_msg.msg_number+',\'null\')";>'+get_lang("Mark as Spam")+'</span>';   
-        }
-                
-        td_other_options.appendChild(div_other_options);
-        //td_other_options.innerHTML = option_print + option_reply_to_all + option_source_msg;
-        
-        tr_other_options.appendChild(td_other_options);
-        tbody_message_options.appendChild(tr_other_options);
-        ////////// END OTHER OPTIONS ////////////////
-
-        ////////// BEGIN SIGNATURE //////////////////
-        if (info_msg.signature && info_msg.signature.length > 0)
-        {
-                var tr_signature = document.createElement("TR");
-                var td_signature = document.createElement("TD");
-                td_signature.className = 'tr_message_header';
-                tr_signature.id = 'tr_signature_'+ID;
-                td_signature.colSpan = "5";
-                tr_signature.style.display = 'none';
-
-                for (i in info_msg.signature)
-                        td_signature.innerHTML += '<span>'+info_msg.signature[i]+'</span> <br /> ';
-                var signature_status_pos = info_msg.signature[0].indexOf(get_lang('Message untouched'));
-                td_signature.id = "td_signature_"+ID;
-                if(signature_status_pos < 0 )
-                {
-                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_error.gif" title="'+get_lang("Details")+'">';
-                tr_signature.style.display = '';
-                }
-                else
-                {
-                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_table.gif" title="'+get_lang("Details")+'">';
-                }
-                td.onclick = function(){
-                var _height = Element("div_message_scroll_"+ID).style.height;
-                _height = parseInt(_height.replace("px",""));
-                var _offset = 130;
-                if (this.value == 'more_cert'){
-                        //this.innerHTML += "<b><u>Mais Informaￜￜes</u></b>";
-                        this.value = 'hide_cert';
-                        Element("div_message_scroll_"+ID).style.height = (_height + _offset)+"px";
-                        Element('tr_signature_'+ID).style.display = 'none';
-                        Element('td_signature_'+ID).style.display = 'none';
-
-                }
-                else{
-                        //this.innerHTML += "Mais Informaￜￜes";
-                        this.value = 'more_cert';
-                        Element("div_message_scroll_"+ID).style.height = (_height - _offset)+"px";
-                        Element('tr_signature_'+ID).style.display = '';
-                        Element('td_signature_'+ID).style.display = '';
-                }
-        };
-
-                tr_signature.appendChild(td_signature);
-                tbody_message_options.appendChild(tr_signature);
-        /******************************************* Old signature   ***********************************************/
-                //if (info_msg.signature != "void")
-                //      td.innerHTML += '&nbsp;<img style="cursor:pointer" onclick="alert(\''+ get_lang("This message is signed, and you can trust.") + info_msg.signature +'\');" src="'+tpl_img_path+'/signed.gif">';
-                //else
-                //      td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='"+tpl_img_path+"/invalid.gif'>";
-        /*****************************************                                                                                                                      ********/
-        }
-        //////////// END SIGNATURE ////////////////
-
-        table_message_options.appendChild(tbody_message_options);
-        td0.appendChild(table_message_options);
-        tr0.appendChild(td0);
-        tbody_message.appendChild(tr0);
-        }
-        // IF DRAFT
-        else
+                        var option_mark_important = '<span class="message_options" onclick="\
+                                                    changeLinkState(this,\'normal\');\
+                                                    set_messages_flag(\'flagged\','+folder_id+');\
+                                                    write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+
+                                                                    '.\');">'+get_lang("Important")+'</span>';
+                option_mark.innerHTML = option_mark_as_unseen+option_mark_important;
+                option_hide_more.innerHTML = get_lang('Options');
+                options.appendChild(option_hide_more);
+
+                var space0 = document.createElement("SPAN");
+                space0.innerHTML = '&nbsp;|&nbsp;';
+                var space1 = document.createElement("SPAN");
+                space1.innerHTML = '&nbsp;|&nbsp;';
+                var space2 = document.createElement("SPAN");
+                space2.innerHTML = '&nbsp;|&nbsp;';
+                var space3 = document.createElement("SPAN");
+                space3.innerHTML = '&nbsp;|&nbsp;';
+                var space4 = document.createElement("SPAN");
+                space4.innerHTML = '&nbsp;|&nbsp;';
+
+                var option_forward = document.createElement("SPAN");
+                option_forward.id = 'msg_opt_forward_'+ID;
+                option_forward.className = 'message_options';
+                option_forward.onclick = function(){new_message('forward', ID);};
+                option_forward.innerHTML = get_lang('Forward');
+                options.appendChild(space1);
+                options.appendChild(option_forward);
+                var option_reply = document.createElement("SPAN");
+                option_reply.id = 'msg_opt_reply_'+ID;
+                option_reply.className = 'message_options';
+                option_reply.onclick = function(){new_message('reply_with_history', ID);};
+                option_reply.innerHTML = get_lang('Reply');
+                options.appendChild(space2);
+                options.appendChild(option_reply);
+                var option_delete = document.createElement("SPAN");
+                option_delete.id = 'msg_opt_delete_'+ID;
+                option_delete.className = 'message_options';
+                option_delete.onclick = function(){proxy_mensagens.delete_msgs(info_msg.msg_folder, info_msg.msg_number, ID);};
+                option_delete.innerHTML = get_lang('Delete');
+                options.appendChild(space3);
+                options.appendChild(option_delete);
+
+                tr.appendChild(td);
+                tr.appendChild(option_mark);
+                tr.appendChild(options);
+                tr.appendChild(next_previous_msg_td);
+                tbody_message_options.appendChild(tr);
+
+                ////////// OTHER OPTIONS ////////////////////
+                var tr_other_options = document.createElement("TR");
+                tr_other_options.id = 'tr_other_options_' + ID;
+                tr_other_options.style.display = 'none';
+
+                var td_other_options = document.createElement("TD");
+                td_other_options.colSpan = '3';
+                //td_other_options.align = 'right';
+                //td_other_options.setAttribute("noWrap","true");
+                var div_other_options = document.createElement("DIV");
+
+                var option_mark_as                                              = '<span>'+get_lang("Mark as")+'</span>: ';
+                var option_mark_as_unseen                               = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unseen\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Unseen")+'.\');">'+get_lang("Unseen")+'</span>, ';
+                var option_mark_as_important                    = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'flagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+'.\');">'+get_lang("Important")+'</span>, ';
+                var option_mark_as_normal                               = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unflagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+'.\');">'+get_lang("Normal")+'</span> | ';
+
+                var option_move                                                 = '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","move_to");>'+get_lang("Move")+'</span> | ';
+                var option_reply_to_all                                 = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_to_all_with_history","'+ID+'");>'+get_lang("Reply to all")+'</span> | ';
+                var option_reply_without_history                = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_without_history","'+ID+'");>'+get_lang("Reply without history")+'</span> | ';
+                var option_reply_to_all_without_history = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_to_all_without_history","'+ID+'");>'+get_lang("Reply to all without history")+'</span> |';
+                var option_source_msg = '<span class="message_options" onclick=proxy_mensagens.proxy_source_msg("'+ID+'","'+url_encode(info_msg.msg_folder)+'");>'+get_lang("Message Font")+'</span> </div>';           
+
+                div_other_options.innerHTML = option_reply_to_all + option_reply_without_history + option_reply_to_all_without_history + option_source_msg;
+                if (use_spam_filter) {
+                        if(info_msg.msg_folder == 'INBOX'+cyrus_delimiter+'Spam')
+                                div_other_options.innerHTML += ' | <span class="message_options" onclick="nospam('+info_msg.msg_number+',\'null\', \''+info_msg.msg_folder+'\')";>'+get_lang("Not Spam")+'</span>';     
+                        else
+                                div_other_options.innerHTML += ' | <span class="message_options" onclick="spam(\''+info_msg.msg_folder+'\', '+info_msg.msg_number+',\'null\')";>'+get_lang("Mark as Spam")+'</span>';   
+                }
+
+                td_other_options.appendChild(div_other_options);
+                //td_other_options.innerHTML = option_print + option_reply_to_all + option_source_msg;
+
+                tr_other_options.appendChild(td_other_options);
+                tbody_message_options.appendChild(tr_other_options);
+                ////////// END OTHER OPTIONS ////////////////
+
+                ////////// BEGIN SIGNATURE //////////////////
+                if (info_msg.signature && info_msg.signature.length > 0)
+                {
+                        var tr_signature = document.createElement("TR");
+                        var td_signature = document.createElement("TD");
+                        td_signature.className = 'tr_message_header';
+                        tr_signature.id = 'tr_signature_'+ID;
+                        td_signature.colSpan = "5";
+                        tr_signature.style.display = 'none';
+
+                        for (i in info_msg.signature)
+                                td_signature.innerHTML += '<span>'+info_msg.signature[i]+'</span> <br /> ';
+                        var signature_status_pos = info_msg.signature[0].indexOf(get_lang('Message untouched'));
+                        td_signature.id = "td_signature_"+ID;
+                        if(signature_status_pos < 0 )
+                        {
+                                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_error.gif" title="'+get_lang("Details")+'">';
+                                tr_signature.style.display = '';
+                        }
+                        else
+                        {
+                                td.innerHTML += '&nbsp;<img style="cursor:pointer" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/signed_table.gif" title="'+get_lang("Details")+'">';
+                        }
+                        td.onclick = function(){
+                                var _height = Element("div_message_scroll_"+ID).style.height;
+                                _height = parseInt(_height.replace("px",""));
+                                var _offset = 130;
+                                if (this.value == 'more_cert'){
+                                        //this.innerHTML += "<b><u>Mais Informaￜￜes</u></b>";
+                                        this.value = 'hide_cert';
+                                        Element("div_message_scroll_"+ID).style.height = (_height + _offset)+"px";
+                                        Element('tr_signature_'+ID).style.display = 'none';
+                                        Element('td_signature_'+ID).style.display = 'none';
+
+                                }
+                                else{
+                                        //this.innerHTML += "Mais Informaￜￜes";
+                                        this.value = 'more_cert';
+                                        Element("div_message_scroll_"+ID).style.height = (_height - _offset)+"px";
+                                        Element('tr_signature_'+ID).style.display = '';
+                                        Element('td_signature_'+ID).style.display = '';
+                                }
+                        };
+
+                        tr_signature.appendChild(td_signature);
+                        tbody_message_options.appendChild(tr_signature);
+                        /******************************************* Old signature   ***********************************************/
+                        //if (info_msg.signature != "void")
+                        //      td.innerHTML += '&nbsp;<img style="cursor:pointer" onclick="alert(\''+ get_lang("This message is signed, and you can trust.") + info_msg.signature +'\');" src="'+tpl_img_path+'/signed.gif">';
+                        //else
+                        //      td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='"+tpl_img_path+"/invalid.gif'>";
+                        /*****************************************                                                                                                                      ********/
+                }
+                //////////// END SIGNATURE ////////////////
+
+                table_message_options.appendChild(tbody_message_options);
+                td0.appendChild(table_message_options);
+                tr0.appendChild(td0);
+                tbody_message.appendChild(tr0);
+        }
+        else    // IF DRAFT
         {
                 var options = document.createElement("TD");
@@ -1538 +1538 @@
         td1.appendChild(deny_email(info_msg.from.email));
         td1.width = "7%";
-        
+
         if (info_msg.sender){
                 var tr111 = document.createElement("TR");
@@ -1559 +1559 @@
                 tbody_message_others_options.appendChild(tr111);
         }
-        
+
         var from = document.createElement("TD");
         from.id = "from_"+ID;
@@ -1594 +1594 @@
                 var reply_to = document.createElement("TD");
                 reply_to.id = "reply_to_"+ID;
-                
+
                 var reply_to_values = document.createElement("INPUT");
                 reply_to_values.id = "reply_to_values_"+ID;
@@ -1657 +1657 @@
                 cc_values.type = "HIDDEN";
                 cc_values.value = info_msg.cc;
-                
+
                 ccaddress_array[ID] = info_msg.cc.split(",");           
                 if (ccaddress_array[ID].length > 1){
@@ -1747 +1747 @@
         date_hour.type = "HIDDEN";
         date_hour.value = info_msg.msg_hour
-        date.className = "header_message_field";
+                date.className = "header_message_field";
         tr4.appendChild(td4);
         tr4.appendChild(date);
@@ -1753 +1753 @@
         tr4.appendChild(date_hour);
         tbody_message_others_options.appendChild(tr4);
-        
+
         var tr5 = document.createElement("TR");
         tr5.className = "tr_message_header";
@@ -1783 +1783 @@
                         if(info_msg.attachments.length > 1) {
                                 var link_attachment     = document.createElement("A");
-                 if(proxy_mensagens.is_local_folder(current_folder))
-                    link_attachment.setAttribute("href", "javascript:expresso_local_messages.download_all_local_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
-                else
-                    link_attachment.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                                if(proxy_mensagens.is_local_folder(current_folder))
+                                        link_attachment.setAttribute("href", "javascript:expresso_local_messages.download_all_local_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                                else
+                                        link_attachment.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
                                 link_attachment.innerHTML = " "+info_msg.attachments.length+' '+get_lang('files')+' :: '+get_lang('Download all atachments');
                                 link_attachment.innerHTML += '<BR>';
@@ -1810 +1810 @@
                         var link_attachment = document.createElement("A");
                         link_attachment.setAttribute("href", proxy_mensagens.link_anexo(info_msg,i));
-//                      link_attachment.setAttribute("href", "javascript:download_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"',"+i+",'"+info_msg.attachments[i].pid+"','"+info_msg.attachments[i].encoding+"')");
+                        //                      link_attachment.setAttribute("href", "javascript:download_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"',"+i+",'"+info_msg.attachments[i].pid+"','"+info_msg.attachments[i].encoding+"')");
                         link_attachment.innerHTML = url_decode(info_msg.attachments[i].name);
                         link_attachment.innerHTML = borkb(info_msg.attachments[i].fsize);
@@ -1901 +1901 @@
         td.appendChild(div);
         tr.appendChild(td)
-        tbody_message.appendChild(tr);
+                tbody_message.appendChild(tr);
 
 
@@ -1950 +1950 @@
                         _link_attachments       = document.createElement("A");
                         _link_attachments.className = "message_options";
-             if(proxy_mensagens.is_local_folder(current_folder))
-                _link_attachments.setAttribute("href", "javascript:expresso_local_messages.download_all_local_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
-            else
-                _link_attachments.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                        if(proxy_mensagens.is_local_folder(current_folder))
+                                _link_attachments.setAttribute("href", "javascript:expresso_local_messages.download_all_local_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                        else
+                                _link_attachments.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
                         _link_attachments.innerHTML = get_lang('Download all atachments');
                 }
-                
+
                 if(_link_attachments){
                         td.innerHTML += " :: ";
                         td.appendChild(_link_attachments);
                 }
-                
+
                 td.innerHTML += "<BR><img src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/menu/ktip.png'>"+get_lang("<b>Tip:</b> For faster save, click over the image with <u>right button</u>.");
                 td.innerHTML += "<BR>";
@@ -2040 +2040 @@
                 return false;
         expresso.connector.hold_session = true;
-        
+
         var footer_menu = Element("footer_menu");       
         if (footer_menu) {
                 footer_menu.style.display = 'none';
         }
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////
         var form = document.createElement("FORM");
         form.name = "form_message_"+ID;
@@ -2054 +2054 @@
         else
                 form.encoding="multipart/form-data";
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////
         //ConstructMenuNewMessage(ID);
-////////////////////////////////////////////////////////////////////////////////////////////////////////        
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////        
         var content = Element('content_id_' + ID);
         var table_message = document.createElement("TABLE");
@@ -2065 +2065 @@
         var td0 = document.createElement("TD");
         td0.colSpan = '3';
-        
+
         var table_menu_new_message = document.createElement("TABLE");
         table_menu_new_message.width = "100%";
@@ -2074 +2074 @@
         var td_menu_new_message = document.createElement("TD");
         td_menu_new_message.setAttribute("noWrap","true");
-        
+
         if ((preferences.save_in_folder == '-1') || (preferences.save_in_folder == '')){
                 //var option_send = '<span class="message_options" onclick=send_message("'+ID+'","null","null");>'+get_lang("Send")+'</span> | ';
@@ -2089 +2089 @@
                 wfolders.alert = true;
         }
-//      var option_save_as              = '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","save");>'+get_lang("Save as")+'</span> | ';
+        //      var option_save_as              = '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","save");>'+get_lang("Save as")+'</span> | ';
         if (!expresso_offline) {
                 var option_save = '<span id="save_message_options_'+ID+'" class="message_options" onclick="openTab.toPreserve['+ID+'] = true; save_msg('+ID+');">'+get_lang("Save")+'</span> | ';
@@ -2099 +2099 @@
         }
         td_menu_new_message.innerHTML = option_send + option_send_and_file + option_save + option_search;
-        
+
         tr_menu_new_message.appendChild(td_menu_new_message);
         tbody_menu_new_message.appendChild(tr_menu_new_message);
         table_menu_new_message.appendChild(tbody_menu_new_message);
-        
+
         content.appendChild(table_menu_new_message);
         tr0.appendChild(td0);
         tbody_message.appendChild(tr0);
-////////////////////////////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////
         var tr1_1 = document.createElement("TR");
         tr1_1.style.display = 'none';
@@ -2114 +2114 @@
         td1_1.setAttribute("noWrap","true");
         td1_1.style.width = "1%";
-        
+
         var td_from = document.createElement("TD");
         td_from.setAttribute("noWrap","true");
         td_from.style.width = "100%";
-                        
+
         var sel_from = document.createElement('SELECT');        
         sel_from.id = "from_"+ID;
@@ -2128 +2128 @@
         tr1_1.appendChild(td_from);
         tbody_message.appendChild(tr1_1);       
-////////////////////////////////////////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////
         var tr1 = document.createElement("TR");
         var td1 = document.createElement("TD");
@@ -2134 +2134 @@
         td1.setAttribute("noWrap","true");
         td1.style.width = "1%";
-        
+
         var td_to = document.createElement("TD");
         td_to.setAttribute("noWrap","true");
         td_to.style.width = "100%";
-        
+
         var input_to = document.createElement('TEXTAREA');
         input_to.id = "to_"+ID;
@@ -2151 +2151 @@
                 input_to.rows = 2;
                 input_to.onkeypress = function (e)
-        {
-            if ((e.keyCode) == 120) //F9
-            {
-                emQuickSearch(input_to.value, 'to', ID);
-            }
-            else
-            {
-                if (((e.keyCode == 13) || ((e.keyCode == 38)||(e.keyCode == 40))) && (document.getElementById('tipDiv').style.visibility!='hidden'))
-                {
-                    e.preventDefault();
-                    search_contacts(e.keyCode,this.id);
-                }
-            }
-        }
-        input_to.onkeyup = function (e)
-        {
-            if ((e.keyCode != 13) && (e.keyCode != 38) && (e.keyCode != 40))
-            {
-                search_contacts(e.keyCode,this.id);
-            }
-        }
+                {
+                        if ((e.keyCode) == 120) //F9
+                        {
+                                emQuickSearch(input_to.value, 'to', ID);
+                        }
+                        else
+                        {
+                                if (((e.keyCode == 13) || ((e.keyCode == 38)||(e.keyCode == 40))) && (document.getElementById('tipDiv').style.visibility!='hidden'))
+                                {
+                                        e.preventDefault();
+                                        search_contacts(e.keyCode,this.id);
+                                }
+                        }
+                }
+                input_to.onkeyup = function (e)
+                {
+                        if ((e.keyCode != 13) && (e.keyCode != 38) && (e.keyCode != 40))
+                        {
+                                search_contacts(e.keyCode,this.id);
+                        }
+                }
         }
         else
@@ -2177 +2177 @@
                 input_to.rows = 3;
                 input_to.onkeyup = function (e)
-        {
-            if ((window.event.keyCode) == 120) //F9
-            {
-                emQuickSearch(input_to.value, 'to', ID);
-            }
-            else 
-            { 
-                search_contacts(window.event.keyCode,this.id);
-            }   
-        }
+                {
+                        if ((window.event.keyCode) == 120) //F9
+                        {
+                                emQuickSearch(input_to.value, 'to', ID);
+                        }
+                        else 
+                        { 
+                                search_contacts(window.event.keyCode,this.id);
+                        }   
+                }
         }
         td_to.appendChild(input_to);
-        
+
         var forwarded_local_message = document.createElement("INPUT"); //Hidden para indicar se é um forward de uma mensagem local
         forwarded_local_message.id = "is_local_forward"+ID;
@@ -2196 +2196 @@
         forwarded_local_message.value = "0";
         td_to.appendChild(forwarded_local_message);
-        
+
         if (!expresso_offline) {
                 var img_search = document.createElement("IMG");
@@ -2206 +2206 @@
                 var img_search = document.createElement("SPAN");
         }
-        
+
         var span_search = document.createElement("SPAN");
         span_search.innerHTML = get_lang('Search');
-        
+
         var td1_img_search = document.createElement("TD");
         td1_img_search.setAttribute("noWrap","true");
         var td1_span_search = document.createElement("TD");
         td1_span_search.setAttribute("noWrap","true");  
-        
+
         td1_img_search.appendChild(img_search);
         td1_span_search.appendChild(span_search);
-        
+
         tr1.appendChild(td1);
         tr1.appendChild(td_to);
@@ -2223 +2223 @@
 
         tbody_message.appendChild(tr1);
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         var tr2 = document.createElement("TR");
         tr2.id = "tr_cc_"+ID;
@@ -2231 +2231 @@
         td2.setAttribute("noWrap","true");      
         td2.style.width = "1%";
-        
+
         var td_cc = document.createElement("TD");
         td_cc.setAttribute("noWrap","true");
         td_cc.style.width = "100%";
-        
+
         var input_cc = document.createElement('TEXTAREA');
         input_cc.id = "cc_"+ID;
@@ -2243 +2243 @@
         input_cc.onfocus = function(){clearTimeout(parseInt(setTimeOutLayer)); search_contacts('onfocus',this.id);};
         input_cc.onblur = function(){setTimeOutLayer=setTimeout('search_contacts("lostfocus","'+this.id+'")',100);};
-    if (!is_ie)
-    {
-        input_cc.rows = 2;
-        input_cc.onkeypress = function (e)
-        {
-            if ((e.keyCode) == 120) //F9
-            {
-                emQuickSearch(input_cc.value, 'cc', ID);
-            }
-            else
-            {
-                if (((e.keyCode == 13) || ((e.keyCode == 38)||(e.keyCode == 40))) && (document.getElementById('tipDiv').style.visibility!='hidden'))
-                {
-                    e.preventDefault();
-                    search_contacts(e.keyCode,this.id);
-                }
-            }
-        }
-        input_cc.onkeyup = function (e)
-        {
-            if ((e.keyCode != 13) && (e.keyCode != 38) && (e.keyCode != 40))
-            {
-                search_contacts(e.keyCode,this.id);
-            }
-        }
-    }
-    else if (is_ie)
-    {
-        input_cc.rows = 3;
-        input_cc.onkeyup = function (e)
-        {
-            if ((window.event.keyCode) == 120) //F9
-            {
-                emQuickSearch(input_cc.value, 'cc', ID);
-            }
-            else
-            {
-                search_contacts(window.event.keyCode,this.id);
-            }
-        }
-    }
-        
+        if (!is_ie)
+        {
+                input_cc.rows = 2;
+                input_cc.onkeypress = function (e)
+                {
+                        if ((e.keyCode) == 120) //F9
+                        {
+                                emQuickSearch(input_cc.value, 'cc', ID);
+                        }
+                        else
+                        {
+                                if (((e.keyCode == 13) || ((e.keyCode == 38)||(e.keyCode == 40))) && (document.getElementById('tipDiv').style.visibility!='hidden'))
+                                {
+                                        e.preventDefault();
+                                        search_contacts(e.keyCode,this.id);
+                                }
+                        }
+                }
+                input_cc.onkeyup = function (e)
+                {
+                        if ((e.keyCode != 13) && (e.keyCode != 38) && (e.keyCode != 40))
+                        {
+                                search_contacts(e.keyCode,this.id);
+                        }
+                }
+        }
+        else if (is_ie)
+        {
+                input_cc.rows = 3;
+                input_cc.onkeyup = function (e)
+                {
+                        if ((window.event.keyCode) == 120) //F9
+                        {
+                                emQuickSearch(input_cc.value, 'cc', ID);
+                        }
+                        else
+                        {
+                                search_contacts(window.event.keyCode,this.id);
+                        }
+                }
+        }
+
         td_cc.appendChild(input_cc);
         var img_search = document.createElement("IMG");
@@ -2292 +2292 @@
         var span_search = document.createElement("SPAN");
         span_search.innerHTML = get_lang('Search');
-        
+
         var td2_img_search = document.createElement("TD");
         td2_img_search.setAttribute("noWrap","true");
         var td2_span_search = document.createElement("TD");
         td2_span_search.setAttribute("noWrap","true");  
-        
+
         td2_img_search.appendChild(img_search);
         td2_span_search.appendChild(span_search);
-                
+
         tr2.appendChild(td2);
         tr2.appendChild(td_cc);
         tr2.appendChild(td2_img_search);
         tbody_message.appendChild(tr2);
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         var tr3 = document.createElement("TR");
         tr3.id = "tr_cco_"+ID;
@@ -2313 +2313 @@
         td3.innerHTML = get_lang("CCo")+":";
         td3.style.width = "1%";
-        
+
         var td_cco = document.createElement("TD");
         td_cco.setAttribute("noWrap","true");
         td_cco.style.width = "100%";
-        
+
         var input_cco = document.createElement('TEXTAREA');
         input_cco.id = "cco_"+ID;
@@ -2325 +2325 @@
         input_cco.onfocus = function(){clearTimeout(parseInt(setTimeOutLayer)); search_contacts('onfocus',this.id);};
         input_cco.onblur = function(){setTimeOutLayer=setTimeout('search_contacts("lostfocus","'+this.id+'")',100);};
-        
+
         if (!is_ie)
-    {
-        input_cco.rows = 2;
-        input_cco.onkeypress = function (e)
-        {
-            if ((e.keyCode) == 120) //F9
-            {
-                emQuickSearch(input_cco.value, 'cco', ID);
-            }
-            else 
-            { 
-                if (((e.keyCode == 13) || ((e.keyCode == 38)||(e.keyCode == 40))) && (document.getElementById('tipDiv').style.visibility!='hidden'))
-                {
-                    e.preventDefault();
-                    search_contacts(e.keyCode,this.id);
-                }
-            }
-        }
-        input_cco.onkeyup = function (e)
-        {
-            if ((e.keyCode != 13) && (e.keyCode != 38) && (e.keyCode != 40))
-            {
-                search_contacts(e.keyCode,this.id);
-            }
-        }
-    }
-    else if (is_ie)
-    {
-        input_cco.rows = 3;
-        input_cco.onkeyup = function (e)
-        {
-            if ((window.event.keyCode) == 120) //F9
-            {
-                emQuickSearch(input_cco.value, 'cco', ID);
-            }
-            else 
-            { 
-                search_contacts(window.event.keyCode,this.id);
-            }   
-        }
-    }
-        
+        {
+                input_cco.rows = 2;
+                input_cco.onkeypress = function (e)
+                {
+                        if ((e.keyCode) == 120) //F9
+                        {
+                                emQuickSearch(input_cco.value, 'cco', ID);
+                        }
+                        else 
+                        { 
+                                if (((e.keyCode == 13) || ((e.keyCode == 38)||(e.keyCode == 40))) && (document.getElementById('tipDiv').style.visibility!='hidden'))
+                                {
+                                        e.preventDefault();
+                                        search_contacts(e.keyCode,this.id);
+                                }
+                        }
+                }
+                input_cco.onkeyup = function (e)
+                {
+                        if ((e.keyCode != 13) && (e.keyCode != 38) && (e.keyCode != 40))
+                        {
+                                search_contacts(e.keyCode,this.id);
+                        }
+                }
+        }
+        else if (is_ie)
+        {
+                input_cco.rows = 3;
+                input_cco.onkeyup = function (e)
+                {
+                        if ((window.event.keyCode) == 120) //F9
+                        {
+                                emQuickSearch(input_cco.value, 'cco', ID);
+                        }
+                        else 
+                        { 
+                                search_contacts(window.event.keyCode,this.id);
+                        }   
+                }
+        }
+
         td_cco.appendChild(input_cco);
         var img_search = document.createElement("IMG");
@@ -2380 +2380 @@
         var td3_span_search = document.createElement("TD");
         td3_span_search.setAttribute("noWrap","true");  
-        
+
         td3_img_search.appendChild(img_search);
         td3_span_search.appendChild(span_search);
-                
+
         tr3.appendChild(td3);
         tr3.appendChild(td_cco);
         tr3.appendChild(td3_img_search);        
         tbody_message.appendChild(tr3);
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         var tr_link = document.createElement("TR");
         tr_link.id = "tr_link_"+ID;             
@@ -2415 +2415 @@
         tr_link.appendChild(td2_link);
         tbody_message.appendChild(tr_link);
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         var tr4 = document.createElement("TR");
         var td4 = document.createElement("TD");
@@ -2431 +2431 @@
         tr4.appendChild(td_subject);
         tbody_message.appendChild(tr4);
-//////////////////////////////////////////////////////////////////////////////////////////////////////  
+        //////////////////////////////////////////////////////////////////////////////////////////////////////  
         var tr5 = document.createElement("TR");
         var td5 = document.createElement("TD");
@@ -2438 +2438 @@
         td_return_receipt.setAttribute("noWrap","true");
         td_return_receipt.innerHTML = get_lang("Return receipt")+":";
-        if (is_ie)
-        {
-            var input_return_receipt = document.createElement('input name=input_return_receipt');
-        }
-        else
-        {
-            var input_return_receipt = document.createElement('input');
-            input_return_receipt.name = "input_return_receipt";
-        }
+        if (is_ie)
+        {
+                var input_return_receipt = document.createElement('input name=input_return_receipt');
+        }
+        else
+        {
+                var input_return_receipt = document.createElement('input');
+                input_return_receipt.name = "input_return_receipt";
+        }
         input_return_receipt.type = "checkbox";
         input_return_receipt.className = "checkbox";
@@ -2453 +2453 @@
         td_return_receipt.appendChild(input_return_receipt);
 
-    // Workaround para resolver problema ao enviar e-mails
-    if((preferences.use_assinar_criptografar != '0'))
+        // Workaround para resolver problema ao enviar e-mails
+        if((preferences.use_assinar_criptografar != '0'))
         {
-        if(parseInt(preferences.use_signature_digital_cripto)==1)
+                if(parseInt(preferences.use_signature_digital_cripto)==1)
                 {
                         td_return_receipt.innerHTML +=  "&nbsp;&nbsp;" + get_lang("Digitally sign message?")+"";
 
-            if (is_ie)
-            {
-                var input_return_digital = document.createElement('input name=input_return_digital');
-            }
-            else
-            {
-                        var input_return_digital = document.createElement('input');
-                input_return_digital.name = "input_return_digital";
-            }
+                        if (is_ie)
+                        {
+                                var input_return_digital = document.createElement('input name=input_return_digital');
+                        }
+                        else
+                        {
+                                var input_return_digital = document.createElement('input');
+                                input_return_digital.name = "input_return_digital";
+                        }
 
                         input_return_digital.type = "checkbox";
@@ -2474 +2474 @@
                         input_return_digital.id = "return_digital_"+ID;
                         input_return_digital.setAttribute("tabIndex","-1");
-            if(parseInt(preferences.use_signature_digital)==1)
+                        if(parseInt(preferences.use_signature_digital)==1)
                         {
                                 input_return_digital.defaultChecked=true;
@@ -2481 +2481 @@
                         td_return_receipt.innerHTML +=  "&nbsp;&nbsp;" + get_lang("Digitally crypt message?")+"";
 
-            if (is_ie)
-            {
-                var input_return_cripto = document.createElement('input name=input_return_cripto');
-            }
-            else
-            {
-                        var input_return_cripto = document.createElement('input');
-                input_return_cripto.name = "input_return_cripto";
-            }
+                        if (is_ie)
+                        {
+                                var input_return_cripto = document.createElement('input name=input_return_cripto');
+                        }
+                        else
+                        {
+                                var input_return_cripto = document.createElement('input');
+                                input_return_cripto.name = "input_return_cripto";
+                        }
 
                         input_return_cripto.type = "checkbox";
@@ -2497 +2497 @@
                         input_return_cripto.defaultChecked=false;
 
-            if(parseInt(preferences.use_signature_cripto)==1)
+                        if(parseInt(preferences.use_signature_cripto)==1)
                         {
                                 input_return_cripto.defaultChecked=true;
@@ -2504 +2504 @@
                         td_return_receipt.appendChild(input_return_cripto);
                 }
-                td_return_receipt.innerHTML += "";
+                td_return_receipt.innerHTML += "";
         }
 
@@ -2541 +2541 @@
         var td5_input = document.createElement("TD");   
         td5_input.innerHTML = "&nbsp;"
-        td5_link.setAttribute("valign","top");
+                td5_link.setAttribute("valign","top");
         td5_link.setAttribute("colSpan","2");
         td5_link.appendChild(add_files);
@@ -2554 +2554 @@
         tr6.appendChild(td6_input);     
         tbody_message.appendChild(tr6);
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         var tr5 = document.createElement("TR");
         var td5 = document.createElement("TD"); 
@@ -2566 +2566 @@
         tr5.appendChild(td_body);
         tbody_message.appendChild(tr5);
-// BEGIN MAKE THE SCROLL HEIGHT
-    var defaultWidth = document.body.clientWidth - (is_ie ? 200 : 195);
+        // BEGIN MAKE THE SCROLL HEIGHT
+        var defaultWidth = document.body.clientWidth - (is_ie ? 200 : 195);
         var _bar = document.getElementById("toolbar");
         var _offset = 0;
@@ -2587 +2587 @@
                 Tooltip.scrollChanged();
         };
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         _div.appendChild(form);
         content.appendChild(_div);
@@ -2594 +2594 @@
         expresso.connector.loadScript("jscode/rich_text_editor");
         RichTextEditor.loadEditor(ID);
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
         if(!expresso_offline)
                 draw_from_field(sel_from,tr1_1);
@@ -2620 +2620 @@
         }
         // Get the shared folders.....
-        var sharedFolders = new Array();
+        var sharedFolders = new Array();
         for(var i = 0; i < folders.length; i++) {
                 var x = folders[i].folder_id;
-        if (folders[i].folder_parent == 'user'){
-                sharedFolders[sharedFolders.length] = x;
-        }
-    }
-
-    var matchUser = '#';
-    var sharedUsers = new Array();
-        // Filter the shared folders (only root folders) .....
-        for(var i = 0; i < sharedFolders.length; i++) {
-      if(!sharedFolders[i].match(matchUser)) {
-                matchUser = sharedFolders[i];
-                sharedUsers[sharedUsers.length] = matchUser.substring(("user"+cyrus_delimiter).length,matchUser.length);
-      }
-    }
+                if (folders[i].folder_parent == 'user'){
+                        sharedFolders[sharedFolders.length] = x;
+                }
+        }
+
+        var matchUser = '#';
+        var sharedUsers = new Array();
+        // Filter the shared folders (only root folders) .....
+        for(var i = 0; i < sharedFolders.length; i++) {
+                if(!sharedFolders[i].match(matchUser)) {
+                        matchUser = sharedFolders[i];
+                        sharedUsers[sharedUsers.length] = matchUser.substring(("user"+cyrus_delimiter).length,matchUser.length);
+                }
+        }
 
         // Handler function for cExecute
@@ -2646 +2646 @@
                         _option.value  = data.myname+";"+Element("user_email").value;
                         sel_from.options[sel_from.options.length] = _option;
-        
+
                         var options = '';
                         for (var x = 0; x < data.length; x++)   {
@@ -2696 +2696 @@
 
                 all_messages = actual_tr.parentNode.childNodes;
-                
+
                 for (var i=0; i < all_messages.length; i++)
                 {
@@ -2704 +2704 @@
                                 last_order = i;
                 }
-                
+
                 if (parseInt(first_order) > parseInt(last_order))
                         changeBgColorToON(all_messages, last_order, first_order);
@@ -2725 +2725 @@
         var div = document.getElementById(id);
         if(!q_limit){
-            div.innerHTML = '<span><font size="2" style="color:red"><strong>'+get_lang("Without Quota")+'</strong></font></span>';
+                div.innerHTML = '<span><font size="2" style="color:red"><strong>'+get_lang("Without Quota")+'</strong></font></span>';
         }
         else{
-        if(div)
-                div.innerHTML = '';
-        value = data['quota_percent'];
-        q_used = data['quota_used'];
-        table = document.getElementById("table_quota");
-        if(table)
-                table.parentNode.removeChild(table);
-        table = document.createElement("TABLE");        
-        tbody = document.createElement("TBODY");        
-        table.appendChild(tbody);
-        table.id = "table_quota";
-        table.width="102";
-        table.border="0";
-        table.cellSpacing = 0;
-        table.cellPadding = 0;
-        
-        //tr1 = document.createElement("TR");
-        td11 = document.createElement("TD");
-        td11.align="center";
-        td11.setAttribute("noWrap","true");
-        td11.innerHTML += '&nbsp;<span class="boxHeaderText">' + value+"% ("+q_used+"M/"+q_limit+"M)</span>";
-        //tr1.appendChild(td11);
-        
-        tr2 = document.createElement("TR");
-        td21 = document.createElement("TD");
-        td21.setAttribute("noWrap","true");
-        td21.height="15";
-        td22 = document.createElement("TD");    
-        td21.setAttribute("background", URL_SERVER + '/phpgwapi/templates/' + template + '/images/dsunused.gif');
-        table221 = document.createElement("TABLE");
-        tbody221 = document.createElement("TBODY");
-        table221.appendChild(tbody221);
-        table221.style.width=value+"%"; 
-        td21.width="102";
-        table221.border="0";
-        table221.cellSpacing = 0;
-        table221.cellPadding = 0;
-        tr221 = document.createElement("TR");
-        td221 = document.createElement("TD");
-        td221.height="15";
-        if(value > 90) {
-                if(value >= 100)
-                        write_msg(get_lang("Your Mailbox is 100% full! You must free more space or will not receive messages."));
+                if(div)
+                        div.innerHTML = '';
+                value = data['quota_percent'];
+                q_used = data['quota_used'];
+                table = document.getElementById("table_quota");
+                if(table)
+                        table.parentNode.removeChild(table);
+                table = document.createElement("TABLE");        
+                tbody = document.createElement("TBODY");        
+                table.appendChild(tbody);
+                table.id = "table_quota";
+                table.width="102";
+                table.border="0";
+                table.cellSpacing = 0;
+                table.cellPadding = 0;
+
+                //tr1 = document.createElement("TR");
+                td11 = document.createElement("TD");
+                td11.align="center";
+                td11.setAttribute("noWrap","true");
+                td11.innerHTML += '&nbsp;<span class="boxHeaderText">' + value+"% ("+q_used+"M/"+q_limit+"M)</span>";
+                //tr1.appendChild(td11);
+
+                tr2 = document.createElement("TR");
+                td21 = document.createElement("TD");
+                td21.setAttribute("noWrap","true");
+                td21.height="15";
+                td22 = document.createElement("TD");    
+                td21.setAttribute("background", URL_SERVER + '/phpgwapi/templates/' + template + '/images/dsunused.gif');
+                table221 = document.createElement("TABLE");
+                tbody221 = document.createElement("TBODY");
+                table221.appendChild(tbody221);
+                table221.style.width=value+"%"; 
+                td21.width="102";
+                table221.border="0";
+                table221.cellSpacing = 0;
+                table221.cellPadding = 0;
+                tr221 = document.createElement("TR");
+                td221 = document.createElement("TD");
+                td221.height="15";
+                if(value > 90) {
+                        if(value >= 100)
+                                write_msg(get_lang("Your Mailbox is 100% full! You must free more space or will not receive messages."));
+                        else
+                                write_msg(get_lang("Warning: Your Mailbox is almost full!"));
+                        td221.setAttribute("background","templates/"+template+"/images/dsalert.gif");
+                }
+                else if(value > 80)
+                        td221.setAttribute("background", URL_SERVER + '/expressoMail1_2/templates/' + template + '/images/dswarn.gif');
                 else
-                        write_msg(get_lang("Warning: Your Mailbox is almost full!"));
-                td221.setAttribute("background","templates/"+template+"/images/dsalert.gif");
-        }
-        else if(value > 80)
-                td221.setAttribute("background", URL_SERVER + '/expressoMail1_2/templates/' + template + '/images/dswarn.gif');
-        else
-                td221.className = 'dsused';
-        
-        tr221.appendChild(td221);
-        tbody221.appendChild(tr221);
-        td21.appendChild(table221);     
-        tr2.appendChild(td21);
-        tr2.appendChild(td11);
-
-        //tr2.appendChild(td1);
-
-        tbody.appendChild(tr2); //Desenho
-        //tbody.appendChild(tr1); //Letras
-        div.appendChild(table);
+                        td221.className = 'dsused';
+
+                tr221.appendChild(td221);
+                tbody221.appendChild(tr221);
+                td21.appendChild(table221);     
+                tr2.appendChild(td21);
+                tr2.appendChild(td11);
+
+                //tr2.appendChild(td1);
+
+                tbody.appendChild(tr2); //Desenho
+                //tbody.appendChild(tr1); //Letras
+                div.appendChild(table);
         }
 }
@@ -2850 +2850 @@
                 }
         };
-        
+
         td_element1.appendChild(chk_box_element);
         td_element2 = document.createElement("TD");
@@ -2881 +2881 @@
         tr_element.appendChild(td_element5);
         tr_element.appendChild(td_element6);
-        
+
         tbody_element.appendChild(tr_element);
         table_element.appendChild(tbody_element);
@@ -2896 +2896 @@
         var action_info_table = document.createElement("TABLE");
         var action_info_tbody = document.createElement("TBODY");
-        
+
         action_info_table.className = "action_info_table";
         action_info_table.width = "100%";
-        
+
         var action_info_tr = document.createElement("TR");
-        
+
         var action_info_th1 = document.createElement("TH");
         action_info_th1.width = "40%";
@@ -2907 +2907 @@
 
         var action_info_th2 = document.createElement("TH");
-        
+
         action_info_th2.innerHTML = msg;
         action_info_th2.className = "action_info_th";
         action_info_th2.setAttribute("noWrap", "true");
-        
+
         var action_info_th3 = document.createElement("TH");
         action_info_th3.width = "40%";
         action_info_th3.innerHTML = "&nbsp;";
-        
+
         action_info_tr.appendChild(action_info_th1);
         action_info_tr.appendChild(action_info_th2);
@@ -2959 +2959 @@
         if (is_ie)
                 table.style.cursor = "hand";
-        
+
         table.appendChild(tbody);
         content_id_0.appendChild(table);
 }
-        var idx_cc = 0;
+var idx_cc = 0;
 function draw_plugin_cc(ID, addrs)
 {
@@ -2987 +2987 @@
         for (i=1; i < array_name.length; i++)
                 cc_data[2] += array_name[i] + " ";                      
-        
+
 
         if(array_addrs.length > 1)                      
@@ -2993 +2993 @@
         else
                 cc_data[3] = array_addrs[0];
-        
+
         var sm_envelope_img1 = '<img style="cursor:'+ (is_ie ? 'hand' : 'pointer') +'" title="' + get_lang("Add Contact") +
-        '" onclick="ccQuickAddOne.showList(\''+cc_data+'\')" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/user_card.png">';
+                '" onclick="ccQuickAddOne.showList(\''+cc_data+'\')" src="' + URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/user_card.png">';
         var to_addybook_add = "<SPAN id='insert_plugin_"+idx_cc+"_"+ID+"'>";
         to_addybook_add += addrs;
@@ -3007 +3007 @@
         expresso.connector.loadScript("jscode/filters");
         var dn_em       = document.createElement("SPAN");
-                dn_em.id = "tt_d";
-                dn_em.onclick = function(){filter_rules.new_rule(email);};
-                dn_em.setAttribute("title",get_lang("Block Sender"));
-                dn_em.style.cursor = "pointer";         
-                dn_em.innerHTML = "<img align='top' onclick=filter.new_rule('"+email+"') src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/deny.gif'>";
+        dn_em.id = "tt_d";
+        dn_em.onclick = function(){filter_rules.new_rule(email);};
+        dn_em.setAttribute("title",get_lang("Block Sender"));
+        dn_em.style.cursor = "pointer";         
+        dn_em.innerHTML = "<img align='top' onclick=filter.new_rule('"+email+"') src='" + URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/deny.gif'>";
         return dn_em;
-        
+
 }
 function show_div_address_full(id, type) {
@@ -3023 +3023 @@
                 var _address = eval(type+"address_array['"+id+"']");
                 var isOverLimit = (_address.length > 100);
-                
+
                 if(isOverLimit) {
                         alert("Esse campo possui muitos endereços ("+_address.length+" destinatários).\r\n"+
-                        "Para evitar o travamento do navegador, o botão 'Adicionar Contato' foi desabilitado!");
+                                        "Para evitar o travamento do navegador, o botão 'Adicionar Contato' foi desabilitado!");
                 }
 
@@ -3050 +3050 @@
 
         var change_font_color = 'onmouseover="var last_class = this.className;'+
-                                'if (this.className != \'message_options_over\')'+
+                'if (this.className != \'message_options_over\')'+
                                 'this.className=\'message_options_active\'; '+
                                 'this.onmouseout=function(){this.className=last_class;}"';
 
-        span_options.innerHTML =
-                '<span class="message_options_trash"><span ' + change_font_color + ' title="'+get_lang("Delete")+'" class="message_options" onclick=proxy_mensagens.delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span></span>'+
-                '<span class="message_options_move"><span ' + change_font_color + ' title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span></span>'+
-                ((expresso_offline)?" ":'<span class="message_options_print"><span ' + change_font_color + ' title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span></span>')+
-//              '<span class="message_options_print"><span ' + change_font_color + ' title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span></span>'+
-        ((expresso_offline)?" ":'<span class="message_options_export"><span ' + change_font_color + ' title="'+get_lang("Export")+'" class="message_options" onclick="proxy_mensagens.export_all_messages()">'+get_lang("Export")+'</span></span>') +
-                ((expresso_offline)?" ":'<span class="message_options_import"><span ' + change_font_color + ' title="'+get_lang("Import")+'" class="message_options" onclick="import_window()">'+get_lang("Import")+'</span></span>');
-    if(preferences.use_local_messages==1 && !expresso_offline)
-                if(proxy_mensagens.is_local_folder(current_folder))
-                        span_options.innerHTML += '&nbsp; <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="expresso_local_messages.unarchive_msgs(\''+folder+'\',null)">'+get_lang("Unarchive")+'</span>';
-                else
-                        span_options.innerHTML += '&nbsp; <span title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
-        if (use_spam_filter) {
-                if ( current_folder == 'INBOX'+cyrus_delimiter+'Spam' ) {
-                        span_options.innerHTML += ' | <span ' + change_font_color + ' title="'+get_lang("Not Spam")+'" class="message_options" onclick="nospam(\'selected\',\'null\',\'null\')">'+get_lang("Not Spam")+'</span>';
-                }
-                else {
-                        span_options.innerHTML += ' | <span ' + change_font_color + ' title="'+get_lang("Mark as Spam")+'" class="message_options" onclick="spam(\'null\', \'selected\',\'null\')">'+get_lang("Mark as Spam")+'</span>';
-                }
-        }
-        var span_D = Element("span_D"); 
-        if(!span_D){
-                span_D = document.createElement("TD");  
-                span_D.align = "right";
-                span_D.style.fontSize = "12";
-                span_D.id = "span_D";
-                span_R.appendChild(span_D);
-        }
-        span_D.innerHTML = 
-                 get_lang("List")+': '+
-        '<span ' + change_font_color + ' id="span_flag_SORTARRIVAL" class="'+(search_box_type == 'ALL' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("All")+'" onclick="if(\'ALL\' == \''+search_box_type+'\') return false;sort_box(\'ALL\',\''+sort_box_type+'\')">'+get_lang("All")+'</span>, '+
-        '<span ' + change_font_color + ' id="span_flag_UNSEEN" class="'+(search_box_type == 'UNSEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_unseen")+'" onclick="if(\'UNSEEN\' == \''+search_box_type+'\') return false;sort_box(\'UNSEEN\',\''+sort_box_type+'\')">'+get_lang("l_unseen")+'</span>, '+
-        '<span ' + change_font_color + ' id="span_flag_SEEN" class="'+(search_box_type == 'SEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_seen")+'" onclick="if(\'SEEN\' == \''+search_box_type+'\') return false;sort_box(\'SEEN\',\''+sort_box_type+'\')">'+get_lang("l_seen")+'</span>, '+
-        '<span ' + change_font_color + ' id="span_flag_ANSWERED" class="'+(search_box_type == 'ANSWERED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_answered")+'" onclick="if(\'ANSWERED\' == \''+search_box_type+'\') return false;sort_box(\'ANSWERED\',\''+sort_box_type+'\')">'+get_lang("l_answered")+'</span>, '+
-        '<span ' + change_font_color + ' id="span_flag_FLAGGED" class="'+(search_box_type == 'FLAGGED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_important")+'" onclick="if(\'FLAGGED\' == \''+search_box_type+'\') return false;sort_box(\'FLAGGED\',\''+sort_box_type+'\')">'+get_lang("l_important")+'</span>&nbsp;&nbsp;';
-        draw_paging(num_msgs);
-        Element("tot_m").innerHTML = num_msgs;  
-}
+                                span_options.innerHTML =
+                                '<span class="message_options_trash"><span ' + change_font_color + ' title="'+get_lang("Delete")+'" class="message_options" onclick=proxy_mensagens.delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span></span>'+
+                                '<span class="message_options_move"><span ' + change_font_color + ' title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span></span>'+
+                                ((expresso_offline)?" ":'<span class="message_options_print"><span ' + change_font_color + ' title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span></span>')+
+                                //              '<span class="message_options_print"><span ' + change_font_color + ' title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span></span>'+
+                                ((expresso_offline)?" ":'<span class="message_options_export"><span ' + change_font_color + ' title="'+get_lang("Export")+'" class="message_options" onclick="proxy_mensagens.export_all_messages()">'+get_lang("Export")+'</span></span>') +
+                                ((expresso_offline)?" ":'<span class="message_options_import"><span ' + change_font_color + ' title="'+get_lang("Import")+'" class="message_options" onclick="import_window()">'+get_lang("Import")+'</span></span>');
+                                if(preferences.use_local_messages==1 && !expresso_offline)
+                                if(proxy_mensagens.is_local_folder(current_folder))
+                                span_options.innerHTML += '&nbsp; <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="expresso_local_messages.unarchive_msgs(\''+folder+'\',null)">'+get_lang("Unarchive")+'</span>';
+                                else
+                                span_options.innerHTML += '&nbsp; <span title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
+                                if (use_spam_filter) {
+                                if ( current_folder == 'INBOX'+cyrus_delimiter+'Spam' ) {
+                                span_options.innerHTML += ' | <span ' + change_font_color + ' title="'+get_lang("Not Spam")+'" class="message_options" onclick="nospam(\'selected\',\'null\',\'null\')">'+get_lang("Not Spam")+'</span>';
+                                }
+                                else {
+                                        span_options.innerHTML += ' | <span ' + change_font_color + ' title="'+get_lang("Mark as Spam")+'" class="message_options" onclick="spam(\'null\', \'selected\',\'null\')">'+get_lang("Mark as Spam")+'</span>';
+                                }
+                                }
+                                var span_D = Element("span_D"); 
+                                if(!span_D){
+                                        span_D = document.createElement("TD");  
+                                        span_D.align = "right";
+                                        span_D.style.fontSize = "12";
+                                        span_D.id = "span_D";
+                                        span_R.appendChild(span_D);
+                                }
+                                span_D.innerHTML = 
+                                        get_lang("List")+': '+
+                                        '<span ' + change_font_color + ' id="span_flag_SORTARRIVAL" class="'+(search_box_type == 'ALL' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("All")+'" onclick="if(\'ALL\' == \''+search_box_type+'\') return false;sort_box(\'ALL\',\''+sort_box_type+'\')">'+get_lang("All")+'</span>, '+
+                                        '<span ' + change_font_color + ' id="span_flag_UNSEEN" class="'+(search_box_type == 'UNSEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_unseen")+'" onclick="if(\'UNSEEN\' == \''+search_box_type+'\') return false;sort_box(\'UNSEEN\',\''+sort_box_type+'\')">'+get_lang("l_unseen")+'</span>, '+
+                                        '<span ' + change_font_color + ' id="span_flag_SEEN" class="'+(search_box_type == 'SEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_seen")+'" onclick="if(\'SEEN\' == \''+search_box_type+'\') return false;sort_box(\'SEEN\',\''+sort_box_type+'\')">'+get_lang("l_seen")+'</span>, '+
+                                        '<span ' + change_font_color + ' id="span_flag_ANSWERED" class="'+(search_box_type == 'ANSWERED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_answered")+'" onclick="if(\'ANSWERED\' == \''+search_box_type+'\') return false;sort_box(\'ANSWERED\',\''+sort_box_type+'\')">'+get_lang("l_answered")+'</span>, '+
+                                        '<span ' + change_font_color + ' id="span_flag_FLAGGED" class="'+(search_box_type == 'FLAGGED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_important")+'" onclick="if(\'FLAGGED\' == \''+search_box_type+'\') return false;sort_box(\'FLAGGED\',\''+sort_box_type+'\')">'+get_lang("l_important")+'</span>&nbsp;&nbsp;';
+                                draw_paging(num_msgs);
+                                Element("tot_m").innerHTML = num_msgs;  
+}

trunk/phpgwapi/inc/class.common.inc.php

@@ -1232 +1232 @@
                         $GLOBALS['phpgw']->js->validate_file('wz_dragdrop','wz_dragdrop');
 
-                        echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>";
+                        echo "\n<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>\n";
                         echo $GLOBALS['phpgw']->js->get_script_links();
 

trunk/phpgwapi/inc/class.javascript.inc.php

@@ -134 +134 @@
                                                                         if ($GLOBALS['phpgw_info']['server']['jspacker'] == "True")
                                                                         {
-                                                                                require_once('class.JavaScriptPacker.php');
-                                                                                $script = file_get_contents(PHPGW_INCLUDE_ROOT .SEP .$app .SEP .'js' .SEP . $pkg .SEP. $file . '.js');
-                                                                                $packer = new JavaScriptPacker($script, 'Normal', true, false);
-                                                                                $packed = $packer->pack();
-                                                                                $links .= "<script>".$packed."</script>\n";
-                                                                        }
+                                                                                $filePath=PHPGW_INCLUDE_ROOT.SEP.$app.SEP.'js'.SEP.$pkg.SEP.$file.'.js';
+                                                                                if (!file_exists($filePath."pack.js"))
+                                                                                {
+                                                                                        $fp = fopen($filePath."pack.js", 'w');
+                                                                                        $script = file_get_contents($filePath);
+                                                                                        require_once('class.JavaScriptPacker.php');
+                                                                                        $packer = new JavaScriptPacker($script, 'Normal', true, false);
+                                                                                        $packed = $packer->pack();
+                                                                                        fwrite($fp, $packed);
+                                                                                        fclose($fp);
+                                                                                }
+                                                                                $links .= '<script type="text/javascript" src="'
+                                                                                        .$GLOBALS['phpgw_info']['server']['webserver_url']
+                                                                                        ."/$app/js/$pkg/$file" . ".jspack.js\"></script>\n";
+                                                                        }       
                                                                         else
                                                                         {

trunk/phpgwapi/js/dJSWin/dJSWin.js

@@ -37 +37 @@
         {
                 is_ie = false;
-                is_ie5 = false
+                is_ie5 = false;
                 is_moz1_6 = false;
                 is_mozilla = false;
@@ -338 +338 @@
                 /* Turn the attribute visible false */
                 this.visible = false;
-        }
+        };
 
         dJSWin.prototype.open = function()
@@ -368 +368 @@
                 /* Turn the attribute visible true */
                 this.visible = true;
-        }
+        };
 
         dJSWin.prototype.show = function()
         {
                 this.open();
-        }
+        };
 
         dJSWin.prototype.hide = function()
         {
                 this.close();
-        }
+        };
 
         dJSWin.prototype.moveTo = function(x,y)
         {
                 dd.elements[this.title.id].moveTo(x,y);
-        }
+        };
 
         dJSWin.prototype.x = function()
         {
                 return dd.elements[this.title.id].x;
-        }
+        };
 
         dJSWin.prototype.y = function()
         {
                 return dd.elements[this.title.id].y;
-        }
+        };
 
         dJSWin.prototype.draw = function()
@@ -464 +464 @@
                 
                 dd.elements[this.title.id].hide();
-        }
+        };
 
         function _dJSWinElement(id)
@@ -480 +480 @@
                         throw("Browser Not Supported!");
                 }
-        }
+        };
 
         if (!dd.elements)

trunk/phpgwapi/js/dftree/dftree.js

@@ -80 +80 @@
         //cons = COokie of Node Status
         //setCookie("cons"+this.id,this._io);
-}
+};
 
 dNode.prototype.open = function () {
@@ -99 +99 @@
                 this._refresh();
         }
-}
+};
 
 
@@ -112 +112 @@
                 this._refresh();
         }
-}
+};
 
 //alter node label and other properties
@@ -124 +124 @@
                 }
         }
-}
+};
 
 //css and dhtml refresh part
@@ -156 +156 @@
 //alter onLoad, etc
 
-}
+};
 
 //gets the proper plus for this moment
@@ -183 +183 @@
                 }
         }
-}
+};
 
 //changes node to selected style class. Perform further actions.
@@ -218 +218 @@
         }
 
-}
+};
 
 //changes node background color.
@@ -231 +231 @@
                 captionSpan.style.paddingBottom = '0px';
         }
-}
+};
 //changes node background color.
 dNode.prototype._onMouseOut = function()
@@ -243 +243 @@
                 captionSpan.style.paddingBottom = '1px';
         }
-}
+};
 
 //changes node to unselected style class. Perform further actions.
@@ -258 +258 @@
                 captionSpan.className = this.captionClass;
         }
-}
+};
 
 
@@ -359 +359 @@
                 parentChildrenDiv.appendChild(divN);
         }
-}
+};
 
 // TREE 
@@ -407 +407 @@
                 }
         }
-}
+};
 
 dFTree.prototype.draw = function(dest_element) {
@@ -426 +426 @@
         }
 
-}
+};
 
 //Transforms tree in HTML code
@@ -443 +443 @@
                 this._drawBranch(this.root.children);
         }*/
-}
+};
 
 //Recursive function, draws children
@@ -453 +453 @@
                 this._drawBranch(childrenArray[a]._children);
         }
-}
+};
 
 //add into a position
@@ -515 +515 @@
         }
 
-}
+};
 
 //arrayProps: same properties of Node
 dFTree.prototype.alter = function(arrayProps) {
         this.getNodeById(arrayProps['id']).alter(arrayProps);
-}
+};
 
 dFTree.prototype.getNodeById = function(nodeid) {
         return this._aNodes[this._searchNode(nodeid)];
-}
+};
 
 dFTree.prototype.openTo = function(nodeid)
@@ -535 +535 @@
                 this.openTo(node._parent.id);
         }
-}
+};
 
 //Searches for a node in the node array, returning the position of the array 4it
@@ -548 +548 @@
         }
         return false;
-}
+};
 // By jakjr, retorna um array com os ids de todas as pastas (nodes)
 dFTree.prototype.getNodesList = function(imapDelimiter) {
@@ -572 +572 @@
         }
         return nodes;
-}
+};
 
 //Auxiliar functions
@@ -591 +591 @@
     }
     return false;
-}
+};
 
 // [Cookie] Clears a cookie
@@ -637 +637 @@
         }
         return "<img "+attributes+" src=\""+src+"\">";
-}
+};