diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index 948efa2..364ee54 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -78,7 +78,7 @@ class SmsController extends Controller {
 	 * @NoCSRFRequired
 	 */
 	public function getConversation ($phoneNumber, $lastDate = 0) {
-		$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber);
+		$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
 		// @ TODO: filter correctly
 		return new JSONResponse(array("conversation" => $messages));
 	}
diff --git a/db/smsmapper.php b/db/smsmapper.php
index 293b074..fd1260a 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -65,11 +65,11 @@ class SmsMapper extends Mapper {
 		return $phoneList;
 	}
 
-	public function getAllMessagesForPhoneNumber ($userId, $phoneNumber) {
+	public function getAllMessagesForPhoneNumber ($userId, $phoneNumber, $minDate = 0) {
 		$query = \OC_DB::prepare('SELECT sms_date, sms_msg, sms_type FROM ' .
 		'*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_address = ? ' .
-		'AND sms_mailbox IN (?,?)');
-		$result = $query->execute(array($userId, $phoneNumber, 0, 1));
+		'AND sms_mailbox IN (?,?) AND sms_date > ?');
+		$result = $query->execute(array($userId, $phoneNumber, 0, 1, $minDate));
 
 		$messageList = array();
 		while($row = $result->fetchRow()) {