Fix order and elements of getMessageSource.

Closes #20