XMPP bodyForLanguage returns nil if body not found

Closes #271
Merged upstream fixed conflict