Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

diff --combined src/mainwindow.c
index fe436a75a9fe01acd87a0386696294f10b6acc8a,4f5fcfc2cf1016a3721567f0db892853c29019ef..55d0857f97c2be7c575cf12f60121534a9e7275f
--- 1/src/mainwindow.c
--- 2/src/mainwindow.c
+++ b/src/mainwindow.c
@@@ -3503,11 -3503,6 +3503,11 @@@ static void get_url_part (const gchar *
                for (i = 0;
                     *buf != '>' && *buf != 0x00 && i < BUFFSIZE;
                        tmp[i++] = *(buf++));
 +              if (*buf == 0) {
 +                      *buffer = NULL;
 +                      *url_decoded = '\0';
 +                      return;
 +              }
                buf++;
        }
        else  {
@@@ -4226,7 -4221,7 +4226,7 @@@ static void mainwindow_check_synchronis
  
        if (offline_ask_sync && ask && alertpanel(_("Folder synchronisation"),
                        _("Do you want to synchronise your folders now?"),
-                       GTK_STOCK_CANCEL, _("+_Synchronise"), NULL) != G_ALERTALTERNATE)
+                       GTK_STOCK_CANCEL, g_strconcat("+", _("_Synchronise"), NULL), NULL) != G_ALERTALTERNATE)
                return;
        
        if (offline_ask_sync)