Use message_id for tempfile creation Closes 2390