Importing the patch from Mo (with some small alterations)
Fixing mail move to Folder issues.
Updated the docs