diff --git a/mod/mail.php b/mod/mail.php
index ef9761509..23d1f5224 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -263,7 +263,14 @@ function mail_content(&$a) {
 //	if( local_channel() && feature_enabled(local_channel(),'richtext') )
 //		$plaintext = false;
 
-	$messages = private_messages_fetch_conversation(local_channel(), $mid, true);
+
+
+	if($mailbox == 'combined') {
+		$messages = private_messages_fetch_conversation(local_channel(), $mid, true);
+	}
+	else {
+		$messages = private_messages_fetch_message(local_channel(), $mid, true);
+	}
 
 	if(! $messages) {
 		//info( t('Message not found.') . EOL);
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 7529f979a..4f54f1a6a 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,5 +1,4 @@
 <div id="mail-{{$mail.id}}" class="mail-conv-outside-wrapper">
-	<a name="mail-{{$mail.id}}"></a>
 	<div class="mail-conv-sender" >
 		<a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
 	</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 7571fd783..fc9b5afa8 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,5 +1,5 @@
 <li>
-	<a href="mail/{{$message.mailbox}}/{{$message.id}}#mail-{{$message.id}}" class="{{if $message.selected}}active{{/if}}">
+	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="{{if $message.selected}}active{{/if}}">
 		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
 		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
 		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>