fix issues when sending SMS with rebranding