From adbc84c48efd790dd8cded5f215d1223f880ec84 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 5 Dec 2011 14:06:41 -0800
Subject: [PATCH] maintain backward compatibility with old PMs

---
 boot.php            |  2 +-
 include/message.php | 28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/boot.php b/boot.php
index 13546d6bb0..875d4a69b4 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1185' );
+define ( 'FRIENDICA_VERSION',      '2.3.1186' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1109      );
 
diff --git a/include/message.php b/include/message.php
index 05157cc83a..baf1bb2d5c 100644
--- a/include/message.php
+++ b/include/message.php
@@ -27,9 +27,27 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	$hash = random_string();
  	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
 
-	if(! strlen($replyto)) {
+	$convid = 0;
+
+	// look for any existing conversation structure
+
+	if(strlen($replyto)) {
+		$r = q("select convid from mail where uid = %d and uri = '%s' limit 1",
+			intval(local_user()),
+			dbesc($replyto)
+		);
+		if(count($r))
+			$convid = $r[0]['convid'];
+	}		
+
+	if(! strlen($replyto))
 		$replyto = $uri;
 
+
+	if(! $convid) {
+
+		// create a new conversation
+
 		$conv_guid = get_guid();
 
 		$recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3);
@@ -52,14 +70,6 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		if(count($r))
 			$convid = $r[0]['id'];
 	}
-	else {
-		$r = q("select convid from mail where uid = %d and uri = '%s' limit 1",
-			intval(local_user()),
-			dbesc($replyto)
-		);
-		if(count($r))
-			$convid = $r[0]['convid'];
-	}		
 
 	if(! $convid) {
 		logger('send message: conversation not found.');