reverted back to email implementation
fixed merg