correctly passing invoice and message ids