reorganizing + new mail function
resolving merge conflict