Improve messages api import. Closes #705