write workflow for outgoing emails to be from the queue email address instead of the owner

i All,

I have written multiple workflows to update the email address to be  FROM: the Queue email instead of the owner of the email. It works but since I have multiple queues, the testing shows that the FROM: is from the same one queue no matter which queue the incoming was, instead of FROM: (selected queue from the incoming email). Any Ideas how to fix that?