Update to Entity API causes problems with messages

Hi,

From the initial install of Commerce Kickstart we had problems with the messages being displayed. We fixed it by the following patch: https://drupal.org/node/1782134

However, to install another module we had to update Entity to the newest version which resulted in the messages disappearing again (screen shot 1 - commerce_message_no_patch_blank.jpg ). We re-patched Entity but unfortunately then it results in screen shot 2 (commerce_message_patch_error.jpg), where some messages are not pulling through correctly.

Any suggestions?

Thanks