diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 0770bd160..fc84cbf57 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3318,8 +3318,8 @@ ul.menu-popup {
 
 
 #mail-list-wrapper {
-border-bottom: 1px solid #ccc;
-margin: 5px 5px 5px 5px;
+border-top: 1px solid #ccc;
+padding: 5px 5px 5px 5px;
 }
 
 span.mail-list {
@@ -3339,6 +3339,10 @@ width: 30px;
 img.mail-list-sender-photo {
 height: 24px;
 width: 24px;
+float: left;
+margin-right: 30px;
+-moz-border-radius: $radiuspx;
+border-radius: $radiuspx;
 }
 
 .tag1 {
@@ -3454,4 +3458,4 @@ a .drop-icons {
 	margin-right: 10px;
 	color: #FF0000;
 }
- 
\ No newline at end of file
+ 
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index e6ddf3651..24966ad1d 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,8 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
-	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
 	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
+	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
+	<div class="clear">&nbsp;</div>
 </div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 164ba0c6d..d65bc3570 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -24,16 +24,16 @@
 <div id="prvmail-submit-wrapper" >
 	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
 	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+		<i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i>
 	</div> 
 
 	<div id="prvmail-attach-wrapper" >
-		<div id="prvmail-attach" class="icon attach" title="{{$attach}}" ></div>
+		<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
 	</div> 
 
 
 	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
 	</div> 
 	<div id="prvmail-rotator-wrapper" >
 		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />