diff --git a/public_html/sites/all/modules/contrib/modr8/modr8_admin.inc b/public_html/sites/all/modules/contrib/modr8/modr8_admin.inc
index 30dc4e7..3e9b0ee 100644
--- a/public_html/sites/all/modules/contrib/modr8/modr8_admin.inc
+++ b/public_html/sites/all/modules/contrib/modr8/modr8_admin.inc
@@ -444,11 +444,7 @@ function modr8_mail($key, &$message, $params) {
   $note = $params['note'];
   switch ($key) {
     case 'notify':
-      // eval the replacements
-      $replacements_raw = modr8_replacements();
-      foreach ($replacements_raw as $key => $val) {
-        eval('$replacements["$key"] = '. $val .';');
-      }
+      $replacements = modr8_replacements($node, $account, $note);
       $params['subject'] = strtr($params['subject'], $replacements);
       $params['message'] = strtr($params['message'], $replacements);
       $message['subject'] = $params['subject'];
@@ -466,23 +462,28 @@ function theme_modr8_note($note) {
   return $note;
 }
 
-function modr8_replacements() {
+function modr8_replacements($node = NULL, $account = NULL, $note = NULL) {
+  if (!$node) {
+    // Only the keys will be used anyways.
+    $node = (object) array('title' => 0, 'teaser' => 0, 'body' => 0, 'created' => 0, 'type' => 0, 'nid' => 0);
+    $account = (object) array('name' => 0, 'mail' => 0, 'uid' => 0);
+  }
   return array(
-    '%title' => '$node->title',
-    '%teaser' => '$node->teaser',
-    '%body' => '$node->body',
-    '%short_date' => 'format_date($node->created, "short")',
-    '%medium_date' => 'format_date($node->created, "medium")',
-    '%long_date' => 'format_date($node->created, "long")',
-    '%type' => 'node_get_types("name", $node)',
-    '%node_url' => 'url("node/". $node->nid, array("absolute" => TRUE))',
-    '%nid' => '$node->nid',
-    '%author_name' => '$account->name',
-    '%author_mail' => '$account->mail',
-    '%author_url' => 'url("user/". $account->uid, array("absolute" => TRUE))',
-    '%site' => 'variable_get("site_name", "Drupal")',
-    '%note' => '$note',
-    '%response_url' => 'url("node/". $node->nid ."/log/response/". modr8_response_token($node->nid, $account->uid), array("absolute" => TRUE))',
+    '%title' => $node->title,
+    '%teaser' => $node->teaser,
+    '%body' => $node->body,
+    '%short_date' => format_date($node->created, "short"),
+    '%medium_date' => format_date($node->created, "medium"),
+    '%long_date' => format_date($node->created, "long"),
+    '%type' => node_get_types("name", $node),
+    '%node_url' => url("node/". $node->nid, array("absolute" => TRUE)),
+    '%nid' => $node->nid,
+    '%author_name' => $account->name,
+    '%author_mail' => $account->mail,
+    '%author_url' => url("user/". $account->uid, array("absolute" => TRUE)),
+    '%site' => variable_get("site_name", "Drupal"),
+    '%note' => $note,
+    '%response_url' => url("node/". $node->nid ."/log/response/". modr8_response_token($node->nid, $account->uid), array("absolute" => TRUE)),
   );
 }