Revert "Fix for receiving multiple emails in one step (bidirectional handshake emails for multi-user confirmations)"

This reverts commit dce0e192adf3d3e890ce01d22e771649167b4da8.
Fix for receiving multiple emails in one step (bidirectional handshake emails for multi-user confirmations)