From d257f70b670b05ddb99e6effaaf5a2ef923983df Mon Sep 17 00:00:00 2001
From: cheshire-mouse <cheshire-mouse@users.noreply.github.com>
Date: Tue, 16 Aug 2016 12:26:08 +0300
Subject: [PATCH] check folder option format

---
 Mailnag/common/accounts.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Mailnag/common/accounts.py b/Mailnag/common/accounts.py
index 5b6024d..a5c5bec 100644
--- a/Mailnag/common/accounts.py
+++ b/Mailnag/common/accounts.py
@@ -28,6 +28,7 @@ import poplib
 import logging
 import json
 import Mailnag.common.imaplib2 as imaplib
+from Mailnag.common.utils import splitstr
 
 account_defaults = {
 	'enabled'			: '0',
@@ -276,7 +277,11 @@ class AccountManager:
 				ssl			= bool(int(	self._get_account_cfg(cfg, section_name, 'ssl')		))
 				imap		= bool(int(	self._get_account_cfg(cfg, section_name, 'imap')	))
 				idle		= bool(int(	self._get_account_cfg(cfg, section_name, 'idle')	))
-				folders		= json.loads(self._get_account_cfg(cfg, section_name, 'folder'))
+				folders_str	= self._get_account_cfg(cfg, section_name, 'folder')
+				if re.match(r'^\[.*\]$', folders_str):
+					folders	= json.loads(folders_str)
+				else:
+					folders	= splitstr(folders_str, ',')
 
 				if self._credentialstore != None:
 					protocol = 'imap' if imap else 'pop'