Merge "Don't sync messages moved from the sent folder"