diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 478ef829cae74a7863d973a1126f9e73923bd09d..756aae63c4d6d062480d0131f0ede9d340e6ba8f 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -63,6 +63,9 @@ if( is_null($content)){
 				}
 			}
 			if($image->loadFromBase64($child->value)) {
+				if($image->width() > 200 || $image->height() > 200) {
+					$image->resize(200);
+				}
 				header('Content-Type: '.$mime);
 				$image();
 				exit();
diff --git a/apps/contacts/templates/part.messagebox.php b/apps/contacts/templates/part.messagebox.php
index 3681bb6e3f3bbe56e40c9ec94ce323c52500bb48..5db10e7e6c54d75ddff34a5ce9797322cbb07c90 100644
--- a/apps/contacts/templates/part.messagebox.php
+++ b/apps/contacts/templates/part.messagebox.php
@@ -1,7 +1,3 @@
 <div id="messagebox">
-<table width="100%" style="border: 0;">
-<tr>
-	<th id="messagebox_msg"></th>
-</tr>
-</table>
+<div id="messagebox_msg"></div>
 </di>