diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16e76a8..b24b5e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 * Enhance the contact list using nicer list like in contact app
 * PHP code cleanup (thanks to PHPStorm)
 * Angular app code cleanup & enhancements
+* Start to implement API calls for restoring messages to phones (using ownCloud SMS app)
+* Show the contact avatar in the conversation
 
 1.6.0
 * You can now limit messages shown when loading a conversation
diff --git a/css/style.css b/css/style.css
index 0a9e385..4005dbe 100644
--- a/css/style.css
+++ b/css/style.css
@@ -73,6 +73,21 @@
 	box-shadow: 0 1px 0 0 #CCC;
 }
 
+#ocsms-contact-avatar {
+	background-color: transparent;
+	height: 75px;
+	width: 75px;
+	font-size: 2.5em;
+	line-height: 75px;
+}
+
+#ocsms-contact-details,
+#ocsms-contact-actions,
+#ocsms-contact-avatar {
+	display: inline-block;
+}
+
+
 #ocsms-phone-label {
 	font-weight: bold;
 	color: #555;
diff --git a/js/public/app.js b/js/public/app.js
index 87c7ab0..ca9d31d 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -232,6 +232,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 				// Reinit main window
 				$scope.selectedContact.label = "";
 				$scope.selectedContact.opt_numbers = "";
+				$scope.selectedContact.avatar = "";
 				$scope.removeContact($scope.selectedContact);
 				$scope.$apply(function () {
 					$scope.messages = [];
@@ -424,6 +425,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 						if ($scope.selectedContact.nav === undefined) {
 							$scope.selectedContact.label = urlPhoneNumber;
 							$scope.selectedContact.nav = urlPhoneNumber;
+							$scope.selectedContact.avatar = "";
 						}
 						$scope.fetchConversation(null);
 						changeSelectedConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']"));
diff --git a/templates/main.php b/templates/main.php
index 93052ee..c0836f3 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -46,11 +46,19 @@ use \OCA\OcSms\Lib\CountryCodes;
 	</div>
 
 	<div id="app-content">
-		<div id="app-content-header" ng-show="selectedContact.label !== undefined && selectedContact.label !== ''">
-			<div id="ocsms-phone-label">{{ selectedContact.label }} </div>
-			<div id="ocsms-conversation-removal" class="icon-delete svn delete action" ng-click="removeConversation();"></div>
-			<div id="ocsms-phone-opt-number">{{ selectedContact.opt_numbers }}</div>
-			<div id="ocsms-phone-msg-nb">{{ messages.length }} message(s) shown. {{ totalMessageCount }} message(s) stored in database.</div>
+		<div id="app-content-header" ng-show="selectedContact.label !== undefined && selectedContact.label !== ''"
+			 ng-style="{'background-color': (selectedContact.label | peerColor)}">
+			<div id="ocsms-contact-avatar">
+				<img class="ocsms-plavatar" data-ng-src="data:image/png;base64,{{ selectedContact.avatar }}" ng-show="contact.avatar !== undefined" />
+			</div>
+			<div id="ocsms-contact-details">
+				<div id="ocsms-phone-label">{{ selectedContact.label }} </div>
+				<div id="ocsms-phone-opt-number">{{ selectedContact.opt_numbers }}</div>
+				<div id="ocsms-phone-msg-nb">{{ messages.length }} message(s) shown. {{ totalMessageCount }} message(s) stored in database.</div>
+			</div>
+			<div id="ocsms-contact-actions">
+				<div id="ocsms-conversation-removal" class="icon-delete svn delete action" ng-click="removeConversation();"></div>
+			</div>
 			
 		</div>
 		<div id="app-content-wrapper">