diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 1708f0d34c..da53539623 100755
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -4412,4 +4412,4 @@ function api_send_mail($to, $subject, $message, $additional_headers = null, $add
 	// Clear all addresses
 	$mail->ClearAddresses();
 	return 1;
-}
+}
\ No newline at end of file
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 8b47321e24..19b0d777e8 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -703,9 +703,9 @@ class MessageManager
 				$band=1;
 
 		$row[5] = Security::remove_XSS($row[5]);
-
+		
 		$message_content =  '
-		<table class="message_view_table" >
+		<table class="message_view_table">
 		    <tr>
 		      <td width=10>&nbsp; </td>
 		      <td vAlign=top width="100%">
@@ -743,15 +743,13 @@ class MessageManager
 		            </tr>
 		        </table>
 		        <br />
-		        <table height=209 width="100%" bgColor=#ffffff>
-		          <TBODY>
-		            <TR>
-		              <TD vAlign=top class="view-message-content">'.str_replace("\\","",$row[6]).'</TD>
-		            </TR>
-		          </TBODY>
+		        <table height=209 width="100%" bgColor=#ffffff>		          
+		            <tr>
+		              <td vAlign=top class="view-message-content">'.str_replace("\\","",$row[6]).'</td>
+		            </tr>
 		        </table>
 		        <div id="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>
-		        <DIV class=HT style="PADDING-BOTTOM: 5px">';
+		        <div class=HT style="padding-bottom: 5px">';
 		    $social_link = '';
 		    if ($_GET['f'] == 'social') {
 		    	$social_link = 'f=social';
@@ -764,9 +762,9 @@ class MessageManager
 		    }
 			$message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''.get_lang('DeleteMessage').'</a>&nbsp';
 
-			$message_content .='</DIV></TD>
-		      <TD width=10></TD>
-		    </TR>
+			$message_content .='</div></td>
+		      <td width=10></td>
+		    </tr>
 		</table>';
 		return $message_content;
 	}
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
old mode 100644
new mode 100755
index 39e0aa9cf9..739835432e
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -201,7 +201,7 @@ function manage_form ($default, $select_from_user_list = null) {
 		
 		//adding reply mail
 		$user_reply_info = UserManager::get_user_info_by_id($message_reply_info['user_sender_id']);
-		$default['content']='<i><br /><br />'.api_get_person_name($user_reply_info['firstname'],$user_reply_info['lastname']).' '.get_lang('Wrote').' : '.api_html_entity_decode($message_reply_info['content'],ENT_QUOTES,$charset).'</i>';
+		$default['content']='<p></p>'.api_get_person_name($user_reply_info['firstname'],$user_reply_info['lastname']).' '.get_lang('Wrote').' :<i> <br />'.api_html_entity_decode($message_reply_info['content'],ENT_QUOTES,$charset).'</i>';
 		
 	}
 	if (empty($group_id)) {