2 files changed, 23 insertions, 15 deletions
diff --git a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
index 827c6279b..e3a5c63ff 100644
--- a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+++ b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
@@ -4,14 +4,16 @@
     %sender%
   </div>
   <div class="post">
-    <div class="post-contents">
-      <p>
-        %message%
-      </p>
-      <div id="insert"></div>
-    </div>
-    <div class="post-footer">
-      <p>%time%</p>
+    <div class="post-body">
+      <div class="post-contents">
+       <p>
+          %message%
+       </p>
+       <div id="insert"></div>
+      </div>
+      <div class="post-footer">
+        <p>%time%</p>
+      </div>
     </div>
     <b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
     <b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
diff --git a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
index 8fe78488d..a4b8183e5 100644
--- a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
+++ b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
@@ -23,10 +23,10 @@ div.person-info {
   z-index: 1;
   float: left;
   margin-top: 25px !important;
-  margin-left: -1em;
-  padding: 0 2em 0 0.5em;
+  margin-left: -12px;
+  padding: 0 24px 0 6px;
   left: 3px;
-  width: 6em;
+  width: 72px;
   background: url(Images/nipple.png) top right no-repeat;
   text-align: center;
   color: #777;
@@ -42,8 +42,8 @@ div.person-info img {
 
 div.post {
   position: relative;
-  margin-left: 6em;
-  padding: 1em;
+  margin-left: 89px;
+  padding: 12px;
 }
 
 b.cr {
@@ -80,7 +80,11 @@ b.bo { bottom: 0px; left: 0px; background-position: bottom left; }
   z-index: 1;
   line-height: 120%;
   padding: 0;
-  margin: 0;
+  margin: 0 0 2em 0;
+}
+
+.post-body {
+  min-height: 40px;
 }
 
 .post-contents p {
@@ -95,7 +99,9 @@ b.bo { bottom: 0px; left: 0px; background-position: bottom left; }
 }
 
 .post-footer {
-  margin-top: 0.5em;
+  position: absolute;
+  bottom: 1em;
+  right: 1em;
 }
 
 .post-footer p {