diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index 19788af..cd306d2 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -19,6 +19,8 @@ Changes
 * Reduced our sync logic from 4 passes to 3 passes (integrating upload of
   "new" and "existing" messages into one function). This should result in a
   slight speedup.
+* No whitespace is stripped from comma-separated arguments passed via
+  the -f option.
 
 Bug Fixes
 ---------
diff --git a/offlineimap/init.py b/offlineimap/init.py
index 296b84b..84983a4 100644
--- a/offlineimap/init.py
+++ b/offlineimap/init.py
@@ -240,8 +240,7 @@ class OfflineImap:
 
         #custom folder list specified?
         if options.folders:
-            foldernames = map(lambda s: s.strip(),
-                              options.folders.split(","))
+            foldernames = options.folders.split(",")
             folderfilter = "lambda f: f in %s" % foldernames
             folderincludes = "[]"
             for accountname in accounts.getaccountlist(config):