Fixed unparsed greeting messages in mails

Change-Id: Ie5dd9c76c19489906a02d4b7a7f98a5a43d74298