Reorder items.
Fix progress dialog.
Re-add ImapAccountSettingsSheet.