diff --git a/sites/all/modules/contrib/mollom/mollom.module b/sites/all/modules/contrib/mollom/mollom.module
index 2960ab3..eb3ffab 100644
--- a/sites/all/modules/contrib/mollom/mollom.module
+++ b/sites/all/modules/contrib/mollom/mollom.module
@@ -2580,8 +2580,21 @@ function _mollom_format_log(array $log) {
     if (isset($entry['message'])) {
       $message .= '<p>';
       if (!empty($entry['arguments'])) {
-        $message .= _mollom_format_string($entry['message'], $entry['arguments']);
-        unset($entry['arguments']);
+        // Check for any conflicts and rename them before merging them into the combined array.
+        if ($conflicts = array_intersect_key($arguments, $entry['arguments'])) {
+          foreach ($conflicts as $arg => $value) {
+            $i = 1;
+            $new_arg = $arg . $i++;
+            while (isset($arguments[$new_arg])) {
+              $new_arg = $arg . $i++;
+            }
+
+            $entry['arguments'][$new_arg] = $entry['arguments'][$arg];
+            $entry['message'] = strtr($entry['message'], array($arg => $new_arg));
+          }
+        }
+        $message .= $entry['message'];
+        $arguments += $entry['arguments'];
       }
       else {
         $message .= $entry['message'];