Kill trailing space from message key

Change-Id: Ibe3e8b245a2f3c6a8252a6dffef3b3465b34b0ec