Local folder refactoring, part 1
Redundant local folder code eliminated
Message body fetch op now stored in the respective local folder
Local folder refactoring, part 2