Added merge from email code