diff --git a/mutt.changes b/mutt.changes
index 97a04d8..bb97704 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 12 08:46:42 UTC 2016 - vmiklos@collabora.co.uk
+
+- Fix patch-1.5.24.sidebar.20151111.patch to shorten
+  imaps://imap.example.com/INBOX correctly to INBOX, not to NBOX. (boo#961470)
+
 -------------------------------------------------------------------
 Tue Dec 22 09:44:55 UTC 2015 - vmiklos@collabora.co.uk
 
diff --git a/mutt.spec b/mutt.spec
index 59f0d6a..d9ba3c4 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mutt
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/patch-1.5.24.sidebar.20151111.patch b/patch-1.5.24.sidebar.20151111.patch
index f092d33..670a931 100644
--- a/patch-1.5.24.sidebar.20151111.patch
+++ b/patch-1.5.24.sidebar.20151111.patch
@@ -1892,7 +1892,7 @@ index 0000000..e9d9eba
 +		/* calculate depth of current folder and generate its display name with indented spaces */
 +		int sidebar_folder_depth = 0;
 +		char *sidebar_folder_name;
-+		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
++		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir));
 +		if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
 +			char *tmp_folder_name;
 +			int i;