- Fix last[-1] comments

- Show custom notification / signature checkboxes for all queues too
- Handle message / signature as HTML, not text
- When merging HTML, keep the same tags as OO.o & word documents

etemplate/inc/class.bo_merge.inc.php

@@ -827,6 +827,12 @@ abstract class bo_merge
 			{
 				switch($mimetype.$mso_application_progid)
 				{
+					case 'text/html':
+						$replace_tags = array(
+							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
+							'<table>','<tr>','<td>',
+						);
+						break;
 					case 'application/vnd.oasis.opendocument.text':		// open office
 					case 'application/vnd.oasis.opendocument.spreadsheet':
 						$replace_tags = array(