More fixes in send_stream_emails