|#999|+Vinay| Fixing message externalizations