Bluetooth Versus Headset

Telus just upgraded the OS on my HTC hero to Android 2.1. The only feature that seems to be no longer enabled is the interaction between a plugged in headset and my Jawbone Icon.

Originally (Android 1.5) I could have the Jawbone active, and when I plugged in a headset my media would play through the headset and I could take calls through the jawbone. Now my phone pushes everything through the Jawbone by default and will not play the music through the headphone when my jawbone is connected.

Is there a setting anywhere that would allow me to control the output priority so that I don't have to turn off my bluetooth to listen to music while I'm at work?