diff --git a/appinfo/application.php b/appinfo/application.php
index 74ea2b9..d1451c7 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -82,11 +82,12 @@ class Application extends App {
 	public function getContacts() {
 		// Only load contacts if they aren't in the buffer
 		if(count(self::$contacts) == 0) {
+			self::$contacts = array();
 			$cm = $this->c['ContactsManager'];
 			$result = $cm->search('',array('FN'));
 			foreach ($result as $r) {
-				if (isset ($r["phone"])) {
-					self::$contacts[$r["phone"]] = $r["FN"];
+				if (isset ($r["TEL"])) {
+					self::$contacts[$r["TEL"]] = $r["FN"];
 				}
 			}
 		}
diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index 14116ce..2f587b8 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -82,7 +82,7 @@ class SmsController extends Controller {
 	public function getConversation ($phoneNumber, $lastDate = 0) {
 		$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
 		// @ TODO: filter correctly
-		return new JSONResponse(array("conversation" => $messages, $contacts => $this->app->getContacts()));
+		return new JSONResponse(array("conversation" => $messages, "contacts" => $this->app->getContacts()));
 	}
 
 	/**