iPhone Upgrade

I upgraded my iPhone, and not getting all of my messages. On the bottom it says 'Downloading Messages from iCloud'. It says I need to be plugged in, and connected to WiFi (which I have been for numerous days). My cell phone provider said that sounds like and Apple problem. Any suggestions on how to get my messages to download?