Params being overridden by default action setup

The last release removed a array_merge() function that added the context as being part of params. This removal created a big issue related to not being able to assign variables on the fly. I had to revert this change. I am not sure if I am doing something wrong here!

mimemail_action.module (line 47)

BEFORE:
$params = array_merge($context, array(
'context' => array(
'subject' => token_replace($context['subject'], $context),
'body' => token_replace($context['body'], $context),
),
'key' => $context['key'],
'cc' => $context['cc'],
'bcc' => $context['bcc'],
'reply-to' => $context['reply-to'],
'plaintext' => token_replace($context['plaintext'], $context),
'attachments' => $context['attachments'],
));

CURRENT:
$params = array(
'context' => array(
'subject' => token_replace($context['subject'], $context),
'body' => token_replace($context['body'], $context),
),
'key' => $context['key'],
'cc' => $context['cc'],
'bcc' => $context['bcc'],
'reply-to' => $context['reply-to'],
'plaintext' => token_replace($context['plaintext'], $context),
'attachments' => $context['attachments'],
);