Bug 1042221 - [email/backend] v2.0 specific uplift of improved saving/shutdown behaviour