Index: branches/2.2/expressoMail1_2/js/draw_api.js
===================================================================
--- branches/2.2/expressoMail1_2/js/draw_api.js	(revision 3287)
+++ branches/2.2/expressoMail1_2/js/draw_api.js	(revision 3352)
@@ -18,5 +18,4 @@
 	}
 var currentTab,numBox = 0; // Open Tab and num of mailboxes opened at context
-
 // Objeto Map, talvez o ideal fosse adicionar este objeto à Api do egroupware, e carregá-lo
 // aqui no expressoMail.
@@ -1478,48 +1477,71 @@
 	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'));
-                var signature_status_pos = info_msg.signature[0].indexOf('Message untouched');
-		td_signature.id = "td_signature_"+ID;
-		if(signature_status_pos < 0 )
-		{
-		td.innerHTML += '&nbsp;<img style="cursor:pointer" src="templates/'+template+'/images/signed_error.gif" title="'+get_lang("Details")+'">';
-		tr_signature.style.display = '';
-		}
-		else
-		{
-		td.innerHTML += '&nbsp;<img style="cursor:pointer" src="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 = '';
-		}
+            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)
+                {
+                    if(typeof(info_msg.signature[i]) == 'object')
+                        {
+                            var aux = '';
+                            for (ii in info_msg.signature[i])
+                                {
+                                    if(info_msg.signature[i][ii].indexOf("###") > -1)
+                                        {
+                                         aux += get_lang(info_msg.signature[i][ii].substring(0,info_msg.signature[i][ii].indexOf("###"))) + info_msg.signature[i][ii].substring(info_msg.signature[i][ii].indexOf("###")+3);
+                                        }
+                                    else
+                                        {
+                                         aux += info_msg.signature[i][ii];
+                                        }
+                                }
+                            td_signature.innerHTML += "<a onclick=\"javascript:alert('" + aux + "')\"><b><font color=\"#0000FF\">" + get_lang("More") + "...</font></b></a>";
+                            continue;
+                        }
+                    if(info_msg.signature[i].indexOf("#@#") > -1)
+                        {
+                         td_signature.innerHTML += '<span style=color:red><strong>'+get_lang(info_msg.signature[i].substring(0,info_msg.signature[i].indexOf("#@#")))+'</strong> '+info_msg.signature[i].substring(info_msg.signature[i].indexOf("#@#")+3)+'</span> <br /> ';
+                        }
+                    if(info_msg.signature[i].indexOf("###") > -1)
+                        {
+                         td_signature.innerHTML += '<span><strong>'+get_lang(info_msg.signature[i].substring(0,info_msg.signature[i].indexOf("###")))+'</strong> '+info_msg.signature[i].substring(info_msg.signature[i].indexOf("###")+3)+'</span> <br /> ';
+                        }
+                }
+            var signature_status_pos = info_msg.signature[0].indexOf('Message untouched');
+            td_signature.id = "td_signature_"+ID;
+            if(signature_status_pos < 0 )
+                {
+                    td.innerHTML += '&nbsp;<img style="cursor:pointer" src="templates/'+template+'/images/signed_error.gif" title="'+get_lang("Details")+'">';
+                    tr_signature.style.display = '';
+                }
+            else
+                {
+                    td.innerHTML += '&nbsp;<img style="cursor:pointer" src="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.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);
+            tr_signature.appendChild(td_signature);
+            tbody_message_options.appendChild(tr_signature);
 	}
 	//////////// END SIGNATURE ////////////////
