Email wrappers saving with upsell

Added a check for saving email wrappers settings and removed them from the node object.

Addresses one of the commits in #421.