Merge "Fix issue w/ duplicated messages after move (to trash/folder)"