updated tour now cannot find option to combine folders

Just up dated my phone yesterday and now when i go into the options to combine the folders that option is gone. My inbox settings only have check boxes for email accounts and sms/mms. How do i combine these into one like i had previously? When i go and check or uncheck the box it is duplicated in the other folder even though i did not change the options in that folder. Any help would be great because i am starting to lose my mind...

Select all of the boxes, and then hide your SMS icon. They will all show in the Message icon.

Thanks, is that the only way to do so now? And for some reason when i get a voice mail it does not come up in my message folder like it use to. I dont know i get one unless i look at the top of the screen and see i have the symbol up there. Is there a way to fix that?

Thanks