More work on incoming email action