Make sure we fall back to email when there is no push message
Make sure we fall back to email when there is no push message