iMessage no longer loading past messages on mac

After the latest update (10.10.3) my iMessage no longer loads past conversations from my iPhone onto my MacPro. I have tried restarting computer, turning imessage off and on on my iphone 6 and Mac, but past messages no longer load in as they did before the new emoji update.

I work primarily on my computer and use iMessage for most conversation, it would be so helpful for these to fill in like they did! Help!