diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index f3cfc1f..2048664 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -148,6 +148,7 @@ build_error_vbox (const gchar *primary_message,
   gtk_label_set_use_markup (GTK_LABEL (w), TRUE);
   gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
   gtk_widget_show (w);
 
   return main_vbox;
@@ -1154,9 +1155,9 @@ account_assistant_build_salut_error_page (EmpathyAccountAssistant *self)
 
   markup = g_strdup_printf ("%s (<span style=\"italic\">%s</span>).",
       _("You won't be able to chat with people connected to your local "
-        "network, as telepathy-salut is not installed.\nIf you want to enable "
-        "this feature, please install the telepathy-salut package\nand create "
-        "a People Nearby account from the Accounts dialog "),
+        "network, as telepathy-salut is not installed. If you want to enable "
+        "this feature, please install the telepathy-salut package and create "
+        "a People Nearby account from the Accounts dialog"),
         _("Edit->Accounts"));
 
   vbox = build_error_vbox (_("telepathy-salut not installed"), markup);
