diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0f531d8a..3f1da5aa7 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-03-04  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-exp.el (org-export-format-source-code-or-example): Mark
+	temporary buffer unmodified, so that it will be killed even if
+	mode like message mode has decided to assign a file name.
+
 	* org.el (org-scan-tags): Improve tag inheritance.
 	(org-scan-tags, org-make-tags-matcher): Make tag comparison
 	case-sensitive.
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 6dae9de2f..a19d2d0d0 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2471,6 +2471,7 @@ Numbering lines works for all three major backends (html, latex, and ascii)."
 			  (funcall mode)
 			(fundamental-mode))
 		      (font-lock-fontify-buffer)
+		      (set-buffer-modified-p nil)
 		      (org-export-htmlize-region-for-paste
 		       (point-min) (point-max))))
 	      (if (string-match "<pre\\([^>]*\\)>\n?" rtn)