Always show images pref not saved

"Always show images from sender" pref on email not being persisted since contact flag merging was not removing flags.

Fixes #550 (closed)