It took forever, but I saved my SMS messages to my SD card, deleted the SMS messages, and then restored them from SD. That seems to have done the trick. Picture messages didn't save, so if you go that route and you didn't save the pics from the message thread already I think you're SOL.
I...