My 9000 does what you're describing as well with OS v5.x. Maybe a possible alternative is to use hyphens instead of spaces like:
Quote:
---------
Sent via BlackBerry
|
EDIT: Just realized the hyphens got stripped after sending the first test message... Strange.