diff --git a/inc/common.php b/inc/common.php
index 02ed243..befc3e1 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1181,6 +1181,22 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace =
             false
         );
     }
+
+    // add mail headers to identify page changes in same mail thread
+    if ($who != 'register') {
+        $file = wikiFN($id);
+        $cur = @filemtime($file);
+
+        $server = parse_url(DOKU_URL, PHP_URL_HOST);
+        $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server;
+        $listid = strtolower(trim($listid, '.'));
+
+        $mail->setHeader('Message-Id', "<$id?rev=$cur@$listid>", false);
+        if ($rev) {
+            $mail->setHeader('In-Reply-To', "<$id?rev=$rev@$listid>", false);
+        }
+    }
+
     return $mail->send();
 }
 
--- dokuwiki/./inc/media.php~	2012-07-30 17:32:21.000000000 +0300
+++ dokuwiki/./inc/media.php	2012-07-30 17:57:02.763464890 +0300
@@ -561,6 +544,19 @@
     $mail->to($to);
     $mail->subject($lang['mail_upload'].' '.$id);
     $mail->setBody($text,$trep);
+
+    $file = mediaFN($id);
+    $cur = @filemtime($file);
+
+    $server = parse_url(DOKU_URL, PHP_URL_HOST);
+    $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server;
+    $listid = strtolower(trim($listid, '.'));
+
+    $mail->setHeader('Message-Id', "<$id?rev=$cur@$listid>", false);
+    if ($old_rev) {
+        $mail->setHeader('In-Reply-To', "<$id?rev=$old_rev@$listid>", false);
+    }
+
     return $mail->send();
 }