Merge branch 'fix-585601'

diff --combined libempathy-gtk/empathy-chat-text-view.c
index 5ed7c69c3e99e0eeb7ba9f8ac1f707d9e1ea2bf2,bdf66333ee6f1c2d7967042f5b4b9bbde136466e..abe1fc1f3a1fea9164185fb96d35421ff611371f
--- 1/libempathy-gtk/empathy-chat-text-view.c
--- 2/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@@ -34,9 -34,9 +34,9 @@@
  #include <gtk/gtk.h>
  
  #include <telepathy-glib/util.h>
 -#include <libmissioncontrol/mc-account.h>
  
  #include <libempathy/empathy-utils.h>
 +#include <libempathy/empathy-account.h>
  
  #include "empathy-chat-text-view.h"
  #include "empathy-chat.h"
@@@ -817,6 -817,10 +817,10 @@@ chat_text_view_clear (EmpathyChatView *
        priv = GET_PRIV (view);
  
        priv->last_timestamp = 0;
+       if (priv->last_contact) {
+               g_object_unref (priv->last_contact);
+               priv->last_contact = NULL;
+       }
  }
  
  static gboolean

diff --combined libempathy-gtk/empathy-theme-adium.c
index 1f1b3b06d906ce457a581b045588867d28001b70,40ae291bfb08f17568cd88db5e10ac4f3557c588..aab1f6f3ddfc583600ed47c6a28fc9166c84a106
--- 1/libempathy-gtk/empathy-theme-adium.c
--- 2/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@@ -392,7 -392,7 +392,7 @@@ theme_adium_append_message (EmpathyChat
        EmpathyThemeAdium     *theme = EMPATHY_THEME_ADIUM (view);
        EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
        EmpathyContact        *sender;
 -      McAccount             *account;
 +      EmpathyAccount        *account;
        McProfile             *account_profile;
        gchar                 *dup_body = NULL;
        const gchar           *body;
@@@ -416,7 -416,7 +416,7 @@@
        /* Get information */
        sender = empathy_message_get_sender (msg);
        account = empathy_contact_get_account (sender);
 -      account_profile = mc_account_get_profile (account);
 +      account_profile = empathy_account_get_profile (account);
        service_name = mc_profile_get_display_name (account_profile);
        timestamp = empathy_message_get_timestamp (msg);
        body = empathy_message_get_body (msg);
@@@ -564,6 -564,13 +564,13 @@@ theme_adium_clear (EmpathyChatView *vie
                                          priv->data->template_html,
                                          basedir_uri);
        g_free (basedir_uri);
+ 
+       /* Clear last contact to avoid trying to add a 'joined'
+        * message when we don't have an insertion point. */
+       if (priv->last_contact) {
+               g_object_unref (priv->last_contact);
+               priv->last_contact = NULL;
+       }
  }
  
  static gboolean