Heri | #3513 | Adding some functional tests
HniDev | #3514 | Updating option text on send a message page