Heri & Sophie | AC3 of #2520: Not reply sms for expired accounts
Heri & Sophie | #NA: Code review comments implementation