diff --git a/db/configmapper.php b/db/configmapper.php
index 126f2ae..d4af5cd 100644
--- a/db/configmapper.php
+++ b/db/configmapper.php
@@ -47,7 +47,7 @@ class ConfigMapper extends Mapper {
 
 	public function hasKey ($key, $value){
 		try {
-			$sql = "SELECT key FROM `*PREFIX*ocsms_config` WHERE `key` = ? AND `user` = ?";
+			$sql = "SELECT `key` FROM `*PREFIX*ocsms_config` WHERE `key` = ? AND `user` = ?";
 			$this->findEntity($sql, array($key, $this->user));
 			return true;
 		} catch (DoesNotExistException $e){
@@ -57,7 +57,7 @@ class ConfigMapper extends Mapper {
 
 	public function getKey ($key) {
 		try {
-			$query = \OCP\DB::prepare("SELECT value FROM `*PREFIX*ocsms_config` WHERE `key` = ? AND `user` = ?");
+			$query = \OCP\DB::prepare("SELECT `value` FROM `*PREFIX*ocsms_config` WHERE `key` = ? AND `user` = ?");
 			$result = $query->execute(array($key, $this->user));
 			while($row = $result->fetchRow()) {
 				return $this->crypto->decrypt($row["value"]);
diff --git a/js/script.js b/js/script.js
index 76ec235..a6797ef 100644
--- a/js/script.js
+++ b/js/script.js
@@ -33,7 +33,11 @@ app.controller('SettingsController', ['$scope',
 	}
 ]);
 
-app.controller('ContactsController' ['$scope', function ($scope) {
+app.controller('ContactsController' ['$scope',
+	function ($scope) {
+		$scope.loadConversation = function () {
+			alert('loadConversation');
+		};
 	}
 ]);
 
@@ -112,7 +116,7 @@ var checkNewMessages = function() {
 					if (typeof jsondata['photos'][peerLabel] != 'undefined') {
 						peerListBuf += 'style="background-image: url(' + jsondata['photos'][peerLabel] + ');"';
 					}
-					peerListBuf += '></div><a href="#" mailbox-navigation="' + idxVal2 + '" style="font-weight: bold;" mailbox-label="' + peerLabel + '">' + peerLabel + ' (' + val + ')</a></li>';
+					peerListBuf += '></div><a href="#" ng-click="loadConversation();" mailbox-navigation="' + idxVal2 + '" style="font-weight: bold;" mailbox-label="' + peerLabel + '">' + peerLabel + ' (' + val + ')</a></li>';
 					$('#app-mailbox-peers ul').prepend(peerListBuf);
 					bufferedContacts.push(peerLabel);
 
@@ -316,7 +320,7 @@ function fetchInitialPeerList(jsondata) {
 			if (typeof jsondata['photos'][peerLabel] != 'undefined') {
 				peerListBuf += 'style="background-image: url(' + jsondata['photos'][peerLabel] + ');"';
 			}
-			peerListBuf += '></div><a href="#" mailbox-navigation="' + idxVal2 + '" mailbox-label="' + peerLabel + '">' + peerLabel + '</a></li>';
+			peerListBuf += '></div><a href="#" ng-click="loadConversation();" mailbox-navigation="' + idxVal2 + '" mailbox-label="' + peerLabel + '">' + peerLabel + '</a></li>';
 			bufferedContacts.push(peerLabel);
 		}
 	});
diff --git a/templates/main.php b/templates/main.php
index f562036..e1bd695 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -9,7 +9,7 @@ use \OCA\OcSms\Lib\CountryCodes;
 
 <div class="ng-scope" id="app" ng-app="OcSms">
 	<div id="app-mailbox-peers">
-		<ul>
+		<ul ng-controller="ContactsController">
 			<li><div id="ocsms-empty-peers">There isn't any conversation</div></li>
 		</ul>
 	</div>