There is a setting in message options -> general options that controls how SMS/MMS messages are handled. You can choose to separate, combine, or have the theme control how SMS/MMS messages are handled. It sounds like the theme you are using is in control right now.