[exim] message_size and SpamAssassin

Hi.
I have some difficulties with large mails and spam scanning.
I'm setting several headers depending on the score, like this

  warn  message = X-Spam-Flag: YES
        condition = ${if < {$message_size}{500K}}
        spam = nobody

  warn  message = X-Spam-Q: 1
        condition = ${if >= {$spam_score_int}{50}{1}{0}}
        condition = ${if < {$spam_score_int}{100}{1}{0}}
        spam = nobody

  warn  message = X-Spam-Q: 2
        condition = ${if >= {$spam_score_int}{100}{1}{0}}
        condition = ${if < {$spam_score_int}{150}{1}{0}}
        spam = nobody

        ...

but because there are warns that don't have the $message_size condition,
SpamAssassin gets called for mails larger than 500K (it just don't set
the X-Spam-Flag header). One obvius solution is to add a $message_size
condition to each and every warn, but is there any 'nicer' way to solve
this?


Regards,
Andreas