From 2cb7691e373e9352892526788adf9f3b93d6217d Mon Sep 17 00:00:00 2001
From: Gerco Dries <gerco@gdries.nl>
Date: Thu, 10 Sep 2015 23:20:36 +0200
Subject: [PATCH] Fixed not calling switch_from_folder_user() for some types of
 mail directories

---
 mailboxes/folders-lib.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 32a1602df..f338271f2 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -1719,7 +1719,7 @@ if ($f->{'type'} == 0) {
 	}
 elsif ($f->{'type'} == 1) {
 	# A qmail maildir
-	return &count_maildir($f->{'file'});
+	$rv = &count_maildir($f->{'file'});
 	}
 elsif ($f->{'type'} == 2) {
 	# A POP3 server
@@ -1739,7 +1739,7 @@ elsif ($f->{'type'} == 2) {
 	}
 elsif ($f->{'type'} == 3) {
 	# An MH directory
-	return &count_mhdir($f->{'file'});
+	$rv = &count_mhdir($f->{'file'});
 	}
 elsif ($f->{'type'} == 4) {
 	# An IMAP server