refactored, email selection on contact select
Merge remote-tracking branch 'origin/master'