[XC-11] fixes for message portlet