diff --git a/appinfo/database.xml b/appinfo/database.xml
index f3d71df..faa2de0 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -177,15 +177,22 @@
 				<type>text</type>
 				<notnull>true</notnull>
 				<length>64</length>
+				<primary>true</primary>
 			</field>
 			<field>
-				<name>sms_address</name>
+				<name>user_id</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+			<field>
+				<name>phone_number</name>
 				<type>text</type>
 				<notnull>true</notnull>
 				<length>512</length>
 			</field>
 			<index>
-				<name>smsdata_conversations_id_address</name>
+				<name>smsdata_conversations_user_id_address</name>
 				<field>
 					<name>id</name>
 				</field>
diff --git a/db/smsmapper.php b/db/smsmapper.php
index 19ab5e2..ec7e073 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -308,6 +308,16 @@ class SmsMapper extends Mapper {
 		return $phoneList;
 	}
 
+	private function getConversationForUserAndPhone($userId, $phoneNumber) {
+        $qb->select('id')
+            ->from('ocsms_conversations')
+            ->where($qb->expr()->andX(
+                $qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),
+                $qb->expr()->in('phone_number', $qb->createNamedParameter($phoneNumber))
+		);
+        $result = $qb->execute();
+	}
+
 	public function writeToDB ($userId, $smsList, $purgeAllSmsBeforeInsert = false) {
 		$this->db->beginTransaction();
 		$qb = $this->db->getQueryBuilder();
@@ -348,7 +358,7 @@ class SmsMapper extends Mapper {
 				(int) $sms["type"]
 			));
 
-
+			$this->getConversationForUserAndPhone($userId, $sms["address"]);
 		}
 
 		$this->db->commit();