diff --git a/lib/implugin.php b/lib/implugin.php
index 3eba3469fd..a6a9a3dad9 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -373,7 +373,16 @@ abstract class ImPlugin extends Plugin
     function formatNotice($notice)
     {
         $profile = $notice->getProfile();
-        return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']';
+        $nicknames = $profile->nickname;
+        if (!empty($notice->reply_to)) {
+            $orig_notice = $notice->getParent();
+            $orig_profile = $orig_notice->getProfile();
+            $nicknames = $nicknames . " => " . $orig_profile->nickname;
+        }
+        common_log(LOG_INFO, "Notice: " . $notice->content, __FILE__);
+        $data = $nicknames . ': ' . $notice->content . ' [' . $notice->id . ']';
+        return $data;
+
     }
     //========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - RECEIVING ========================\
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 51139a6684..3d20c14c4c 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -346,8 +346,18 @@ class XmppPlugin extends ImPlugin
         $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
         $xs->element('a', array('href' => $profile->profileurl),
                      $profile->nickname);
-        $xs->text(": ");
+        if (!empty($notice->reply_to)) {
+            $orig_notice = Notice::getKV('id', $notice->reply_to);
+            $orig_profile = $orig_notice->getProfile();
+            $xs->text(" => ");
+            $xs->element('a', array('href' => $orig_profile->profileurl),
+                $orig_profile->nickname);
+            $xs->text(": ");
+        } else {
+            $xs->text(": ");
+        }
         if (!empty($notice->rendered)) {
+            $notice->rendered = str_replace("\t", "", $notice->rendered);
             $xs->raw($notice->rendered);
         } else {
             $xs->raw(common_render_content($notice->content, $notice));