fix for --movehamto command line option
Merge commit '14bfa21c9' into gmail
the --movehamto command should *NOT* move to trash