fixed bad merge
added again external acocunts when mail is enabled