diff --git a/js/script.js b/js/script.js
index 4592e29..4ca92dd 100644
--- a/js/script.js
+++ b/js/script.js
@@ -31,14 +31,16 @@ app.controller('OcSmsController', ['$scope',
 		$scope.sendCountry = function () {
 			$.post(OC.generateUrl('/apps/ocsms/set/country'),{'country': $('select[name=intl_phone]').val()});
 		};
-		$scope.loadConversation = function () {
-			//@TODO
-		};
-		$scope.replaceContacts = function (ctList) {
-			$scope.$apply(function () {
-				$scope.contacts = ctList;
-			});
+		$scope.loadConversation = function (contact) {
+			OC.Util.History.pushState('phonenumber=' + contact.nav);
+
+			// phoneNumber must exist
+			if (contact.nav !== null) {
+				fetchConversation(contact.nav);
+				changeSelectedConversation($("a[mailbox-navigation='" + contact.nav + "']"));
+			}
 		};
+
 		$scope.addContact = function (ct) {
 			$scope.$apply(function () {
 				$scope.contacts.push(ct);
@@ -120,7 +122,7 @@ var checkNewMessages = function() {
 					if (typeof jsondata['photos'][peerLabel] != 'undefined') {
 						peerListBuf += 'style="background-image: url(' + jsondata['photos'][peerLabel] + ');"';
 					}
-					peerListBuf += '></div><a href="#" ng-click="loadConversation();" mailbox-navigation="' + idxVal2 + '" style="font-weight: bold;" mailbox-label="' + peerLabel + '">' + peerLabel + ' (' + val + ')</a></li>';
+					peerListBuf += '></div><a href="#" ng-click="loadConversation(' + idxVal2 + ');" mailbox-navigation="' + idxVal2 + '" style="font-weight: bold;" mailbox-label="' + peerLabel + '">' + peerLabel + ' (' + val + ')</a></li>';
 					$('#app-mailbox-peers ul').prepend(peerListBuf);
 					bufferedContacts.push(peerLabel);
 
@@ -139,7 +141,8 @@ var checkNewMessages = function() {
 						// phoneNumber must exist
 						if (phoneNumber != null) {
 							fetchConversation(phoneNumber);
-								unreadCountAllConv += val;changeSelectedConversation($(this));
+							unreadCountAllConv += val;
+							changeSelectedConversation($(this));
 						}
 						event.preventDefault();
 					});
@@ -292,6 +295,10 @@ function formatConversation(jsondata) {
 }
 
 function changeSelectedConversation(item) {
+	if (item === 'undefined' || item == null) {
+		return;
+	}
+
 	if (selectedConversation != null) {
 		selectedConversation.parent().removeClass('selected');
 	}
@@ -370,29 +377,12 @@ function desktopNotify(msg) {
 		$.getJSON(OC.generateUrl('/apps/ocsms/get/peerlist'), function(jsondata, status) {
 			fetchInitialPeerList(jsondata);
 
-			// Now bind the events when we click on the phone number
-			$('#app-mailbox-peers').find('a[mailbox-navigation]').on('click', function (event) {
-				var phoneNumber = $(this).attr('mailbox-navigation');
-				OC.Util.History.pushState('phonenumber=' + phoneNumber);
-
-				// phoneNumber must exist
-				if (phoneNumber != null) {
-					fetchConversation(phoneNumber);
-					changeSelectedConversation($(this));
-				}
-				event.preventDefault();
-			});
-
 			var pnParam = $.urlParam('phonenumber');
 			if (pnParam != null) {
 				var urlPhoneNumber = decodeURIComponent(pnParam);
 				if (urlPhoneNumber != null) {
 					fetchConversation(urlPhoneNumber);
-
-					var pObject = $("a[mailbox-navigation='" + urlPhoneNumber + "']");
-					if (pObject != null) {
-						changeSelectedConversation(pObject);
-					}
+					changeSelectedConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']"));
 				}
 			}
 			// Don't show message headers if no conversation selected
diff --git a/templates/main.php b/templates/main.php
index fd4d813..ba97c6f 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -12,7 +12,7 @@ use \OCA\OcSms\Lib\CountryCodes;
 		<ul>
 			<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>
+				<a mailbox-label="{{ contact.label }}" mailbox-navigation="{{ contact.nav }}" ng-click="loadConversation(contact);" href="#">{{ contact.label }}</a>
 			</li>
 		</ul>
 	</div>