=== modified file 'zim/gui/pageview.py'
--- zim/gui/pageview.py	2011-05-13 06:29:55 +0000
+++ zim/gui/pageview.py	2011-06-02 11:53:56 +0000
@@ -3516,7 +3516,15 @@
 		else:
 			buffer = self.view.get_buffer()
 			if buffer.get_modified():
-				self._parsetree = buffer.get_parsetree()
+				tree = buffer.get_parsetree()
+				print ">>> Parsetree original:", tree.tostring()
+				from zim.formats import get_format
+				format = get_format("wiki")
+				dumper = format.Dumper()
+				parser = format.Parser()
+				tree = parser.parse(dumper.dump(tree))
+				print ">>> Parsetree recreated:", tree.tostring()
+				self._parsetree = tree
 				buffer.set_modified(False)
 			#~ print self._parsetree.tostring()
 			return self._parsetree

=== modified file 'zim/notebook.py'
--- zim/notebook.py	2011-05-15 21:15:09 +0000
+++ zim/notebook.py	2011-06-02 11:54:15 +0000
@@ -1971,6 +1971,7 @@
 		for tags in the parsetree.
 		'''
 		tree = self.get_parsetree()
+		print ">>> GET TAGS TREE:", tree.tostring()
 		if tree:
 			tags = {}
 			for tag in tree.getiterator('tag'):