diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart
index 56497a5..da13f2c 100644
--- a/lib/views/messageview.dart
+++ b/lib/views/messageview.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:cwtch/cwtch_icons_icons.dart';
+import 'package:cwtch/widgets/profileimage.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/views/peersettingsview.dart';
@@ -49,7 +50,17 @@ class _MessageViewState extends State<MessageView> {
           appBar: AppBar(
             // setting leading to null makes it do the default behaviour; container() hides it
             leading: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1 ? Container() : null,
-            title: Text(Provider.of<ContactInfoState>(context).nickname),
+            title:  Row(children: [
+            ProfileImage(
+            imagePath: Provider.of<ContactInfoState>(context).imagePath,
+            diameter: 42,
+            border: Provider.of<Settings>(context).current().portraitOnlineBorderColor(),
+            badgeTextColor: Colors.red,
+            badgeColor: Colors.red,
+          ),
+          SizedBox(
+            width: 10,
+          ),Text(Provider.of<ContactInfoState>(context).nickname)]),
             actions: [
               //IconButton(icon: Icon(Icons.chat), onPressed: _pushContactSettings),
               //IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings),
diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart
index 1a35fe5..5b7f468 100644
--- a/lib/widgets/contactrow.dart
+++ b/lib/widgets/contactrow.dart
@@ -20,6 +20,8 @@ class _ContactRowState extends State<ContactRow> {
     var contact = Provider.of<ContactInfoState>(context);
     return Card(
         clipBehavior: Clip.antiAlias,
+        color: Provider.of<AppState>(context).selectedConversation == contact.onion ? Provider.of<Settings>(context).theme.backgroundHilightElementColor() : null,
+        borderOnForeground: false,
         child: InkWell(
           child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
             Padding(