Support for cobranded emails
Small fixes