diff --git a/js/script.js b/js/script.js
index 809bd47..4592e29 100644
--- a/js/script.js
+++ b/js/script.js
@@ -32,7 +32,17 @@ app.controller('OcSmsController', ['$scope',
 			$.post(OC.generateUrl('/apps/ocsms/set/country'),{'country': $('select[name=intl_phone]').val()});
 		};
 		$scope.loadConversation = function () {
-			alert('loadConversation');
+			//@TODO
+		};
+		$scope.replaceContacts = function (ctList) {
+			$scope.$apply(function () {
+				$scope.contacts = ctList;
+			});
+		};
+		$scope.addContact = function (ct) {
+			$scope.$apply(function () {
+				$scope.contacts.push(ct);
+			});
 		};
 	}
 ]);
@@ -297,6 +307,8 @@ function fetchInitialPeerList(jsondata) {
 
 	var bufferedContacts = [];
 
+	var aScope = angular.element('[ng-controller="OcSmsController"]').scope();
+
 	$.each(jsondata['phonelist'], function(id, val) {
 		var fn, peerLabel, idxVal;
 		idxVal = id.replace(/\//g,' ');
@@ -310,21 +322,12 @@ function fetchInitialPeerList(jsondata) {
 			peerLabel = fn;
 		}
 		if ($.inArray(peerLabel, bufferedContacts) == -1) {
-			peerListBuf += '<li peer-label="' + peerLabel + '"><div class="ocsms-plavatar"';
-			if (typeof jsondata['photos'][peerLabel] != 'undefined') {
-				peerListBuf += 'style="background-image: url(' + jsondata['photos'][peerLabel] + ');"';
-			}
-			peerListBuf += '></div><a href="#" ng-click="loadConversation();" mailbox-navigation="' + idxVal2 + '" mailbox-label="' + peerLabel + '">' + peerLabel + '</a></li>';
+			aScope.addContact({'label': peerLabel, 'nav': idxVal2, 'avatar': jsondata['photos'][peerLabel]});
 			bufferedContacts.push(peerLabel);
 		}
 	});
 
 	lastMsgDate = jsondata["lastRead"];
-
-	// Only modify peerList if there is peers
-	if (peerListBuf != '') {
-		$('#app-mailbox-peers ul').html(peerListBuf);
-	}
 }
 
 function initDesktopNotifies() {
diff --git a/templates/main.php b/templates/main.php
index 0672089..fd4d813 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -10,8 +10,8 @@ use \OCA\OcSms\Lib\CountryCodes;
 <div class="ng-scope" id="app" ng-app="OcSms" ng-controller="OcSmsController">
 	<div id="app-mailbox-peers">
 		<ul>
-			<li ng-repeat="contact in contacts">
-				<div class="ocsms-plavatar"></div>
+			<li ng-repeat="contact in contacts" peer-label="{{ contact.label }}">
+				<div class="ocsms-plavatar" style="background-image: url('{{ contact.avatar }}');"></div>
 				<a mailbox-label="{{ contact.label }}" mailbox-navigation="{{ contact.nav }}" ng-click="loadConversation();" href="#">{{ contact.label }}</a>
 			</li>
 		</ul>