Move the email-related checkboxes into their 'Notification Settings' fieldset