LB-397: SMS Source

some fixes