OP is talking about when you tap on a contact listed under your call logs, it'll show your SMS history mixed with your call history to that person. This happens even when "all calls" is selected under the main call log tab. Anyways, that setting is for the main call log only. If you tap a contact, you'll get everything...which is very annoying. Unfortunately, I haven't been able to find any setting for that.