Plugin SMS & FAX: fix branding.
Resolve conflicts