diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index fb5ad70f3f..92637ac0ba 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -221,8 +221,6 @@ static void cleanup_subject(struct strbuf *subject)
 {
 	char *pos;
 	size_t remove;
-	int brackets_removed = 0;
-
 	while (subject->len) {
 		switch (*subject->buf) {
 		case 'r': case 'R':
@@ -237,15 +235,10 @@ static void cleanup_subject(struct strbuf *subject)
 			strbuf_remove(subject, 0, 1);
 			continue;
 		case '[':
-			/* remove only one set of square brackets */
-			if (brackets_removed)
-				break;
-
 			if ((pos = strchr(subject->buf, ']'))) {
 				remove = pos - subject->buf;
 				if (remove <= (subject->len - remove) * 2) {
 					strbuf_remove(subject, 0, remove + 1);
-					brackets_removed = 1;
 					continue;
 				}
 			} else
diff --git a/t/t5100/info0012 b/t/t5100/info0012
index 9cd1415d25..ac1216ff75 100644
--- a/t/t5100/info0012
+++ b/t/t5100/info0012
@@ -1,5 +1,5 @@
 Author: Dmitriy Blinov
 Email: bda@mnsspb.ru
-Subject: [Navy-patches] Изменён список пакетов необходимых для сборки
+Subject: Изменён список пакетов необходимых для сборки
 Date: Wed, 12 Nov 2008 17:54:41 +0300
 
diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
index 3a757d7d8f..c3074ac573 100644
--- a/t/t5100/sample.mbox
+++ b/t/t5100/sample.mbox
@@ -514,7 +514,7 @@ MIME-Version: 1.0
 Content-Type: text/plain;
   charset=utf-8
 Content-Transfer-Encoding: 8bit
-Subject: [PATCH] [Navy-patches]
+Subject: [Navy-patches] [PATCH]
 	=?utf-8?b?0JjQt9C80LXQvdGR0L0g0YHQv9C40YHQvtC6INC/0LA=?=
 	=?utf-8?b?0LrQtdGC0L7QsiDQvdC10L7QsdGF0L7QtNC40LzRi9GFINC00LvRjyA=?=
 	=?utf-8?b?0YHQsdC+0YDQutC4?=