[1mdiff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c[m
[1mindex a8ca745..4e41207 100644[m
[1m--- a/libempathy-gtk/empathy-chat.c[m
[1m+++ b/libempathy-gtk/empathy-chat.c[m
[36m@@ -569,6 +569,7 @@ chat_property_changed_cb (EmpathyTpChat *tp_chat,[m
 			  EmpathyChat   *chat)[m
 {[m
 	EmpathyChatPriv *priv = GET_PRIV (chat);[m
[32m+[m	[32mgchar           *subject_with_markup;[m
 [m
 	if (!tp_strdiff (name, "subject")) {[m
 		g_free (priv->subject);[m
[36m@@ -578,7 +579,9 @@ chat_property_changed_cb (EmpathyTpChat *tp_chat,[m
 		if (EMP_STR_EMPTY (priv->subject)) {[m
 			gtk_widget_hide (priv->hbox_topic);[m
 		} else {[m
[31m-			gtk_label_set_text (GTK_LABEL (priv->label_topic), priv->subject);[m
[32m+[m			[32msubject_with_markup = empathy_add_markup (priv->subject);[m
[32m+[m			[32mgtk_label_set_markup (GTK_LABEL (priv->label_topic), subject_with_markup);[m
[32m+[m			[32mg_free (subject_with_markup);[m
 			gtk_widget_show (priv->hbox_topic);[m
 		}[m
 		if (priv->block_events_timeout_id == 0) {[m
[1mdiff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c[m
[1mindex a9a673c..4bec064 100644[m
[1m--- a/libempathy-gtk/empathy-contact-widget.c[m
[1m+++ b/libempathy-gtk/empathy-contact-widget.c[m
[36m@@ -890,8 +890,11 @@ contact_widget_name_notify_cb (EmpathyContactWidget *information)[m
 static void[m
 contact_widget_presence_notify_cb (EmpathyContactWidget *information)[m
 {[m
[31m-  gtk_label_set_text (GTK_LABEL (information->label_status),[m
[31m-      empathy_contact_get_status (information->contact));[m
[32m+[m[32m  gchar *status_with_markup = empathy_add_markup ([m
[32m+[m[32m                              empathy_contact_get_status (information->contact));[m
[32m+[m[32m  gtk_label_set_markup (GTK_LABEL (information->label_status),[m
[32m+[m[32m      status_with_markup);[m
[32m+[m[32m  g_free (status_with_markup);[m
   gtk_image_set_from_icon_name (GTK_IMAGE (information->image_state),[m
       empathy_icon_name_for_contact (information->contact),[m
       GTK_ICON_SIZE_BUTTON);[m
[1mdiff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c[m
[1mindex e91ac62..b4e3864 100644[m
[1m--- a/libempathy-gtk/empathy-ui-utils.c[m
[1m+++ b/libempathy-gtk/empathy-ui-utils.c[m
[36m@@ -1539,4 +1539,63 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)[m
 		G_CALLBACK (file_manager_receive_file_response_cb), handler);[m
 [m
 	gtk_widget_show (widget);[m
[31m-}[m
\ No newline at end of file[m
[32m+[m[32m}[m
[32m+[m
[32m+[m[32mstatic gboolean[m
[32m+[m[32mempathy_markup_starts_with (const gchar* str, const gchar* prefix)[m
[32m+[m[32m{[m
[32m+[m	[32mg_return_val_if_fail (str != NULL, FALSE);[m
[32m+[m	[32mg_return_val_if_fail (prefix != NULL, FALSE);[m
[32m+[m
[32m+[m	[32mreturn g_str_has_prefix (str, prefix) &&[m
[32m+[m		[32mg_strcmp0 (str, prefix);[m
[32m+[m[32m}[m
[32m+[m
[32m+[m[32mstatic gboolean[m
[32m+[m[32mempathy_markup_valid (const gchar* str)[m
[32m+[m[32m{[m
[32m+[m	[32mg_return_val_if_fail (str != NULL, FALSE);[m
[32m+[m
[32m+[m	[32mreturn empathy_markup_starts_with (str, "http://") ||[m
[32m+[m		[32mempathy_markup_starts_with (str, "https://") ||[m
[32m+[m		[32mempathy_markup_starts_with (str, "ftp://") ||[m
[32m+[m		[32mempathy_markup_starts_with (str, "ftp.") ||[m
[32m+[m		[32mempathy_markup_starts_with (str, "www.");[m
[32m+[m[32m}[m
[32m+[m
[32m+[m[32mgchar*[m
[32m+[m[32mempathy_add_markup (const gchar* text)[m
[32m+[m[32m{[m
[32m+[m	[32mGString  *with_markup = g_string_new ("");[m
[32m+[m	[32mgchar    **splits = NULL;[m
[32m+[m	[32mgchar    *split, *ret, *escaped;[m
[32m+[m	[32mint       i = 0;[m
[32m+[m
[32m+[m	[32mif (text != NULL) {[m
[32m+[m		[32msplits = g_strsplit (text, " ", -1);[m
[32m+[m
[32m+[m		[32mwhile ((split = splits[i]) != NULL)[m
[32m+[m		[32m{[m
[32m+[m			[32mg_string_append_printf (with_markup, " ");[m
[32m+[m			[32mescaped = g_markup_escape_text (split, -1);[m
[32m+[m
[32m+[m			[32mif (empathy_markup_valid (split)) {[m
[32m+[m				[32mg_string_append_printf (with_markup,[m
[32m+[m										[32m"<a href=\"%s\">%s</a>",[m
[32m+[m										[32mescaped, escaped);[m
[32m+[m			[32m}[m
[32m+[m			[32melse {[m
[32m+[m				[32mg_string_append (with_markup, escaped);[m
[32m+[m			[32m}[m
[32m+[m
[32m+[m			[32mg_free (escaped);[m
[32m+[m			[32mi++;[m
[32m+[m		[32m}[m
[32m+[m	[32m}[m
[32m+[m
[32m+[m	[32mret = with_markup->str;[m
[32m+[m	[32mg_strfreev(splits);[m
[32m+[m	[32mg_string_free (with_markup, FALSE);[m
[32m+[m
[32m+[m	[32mreturn ret;[m
[32m+[m[32m}[m
[1mdiff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h[m
[1mindex 10f889b..3d5b8ab 100644[m
[1m--- a/libempathy-gtk/empathy-ui-utils.h[m
[1m+++ b/libempathy-gtk/empathy-ui-utils.h[m
[36m@@ -112,6 +112,9 @@ GtkWidget * empathy_link_button_new                     (const gchar      *url,[m
 void        empathy_send_file_with_file_chooser         (EmpathyContact   *contact);[m
 void        empathy_receive_file_with_file_chooser      (EmpathyFTHandler *handler);[m
 [m
[32m+[m[32m/* URL */[m
[32m+[m[32mgchar*       empathy_add_markup                         (const gchar* text);[m
[32m+[m
 G_END_DECLS[m
 [m
 #endif /*  __EMPATHY_UI_UTILS_H__ */[m
