diff --git a/ChangeLog b/ChangeLog
index 76b5176ab..212f583c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2006-05-25  Don Allingham  <don@gramps-project.org>
+	* src/DisplayTabs/_NoteTab.py (NoteTab.flow_changed): save flow status
+	in Note
 	* src/Merge/_MergeSource.py: note handling on source merge
 	* src/glade/mergedata.glade: note handling on source merge
 	* src/Makefile.am: remove deleted files
diff --git a/src/DisplayTabs/_NoteTab.py b/src/DisplayTabs/_NoteTab.py
index 0452a1269..fe1ce07fa 100644
--- a/src/DisplayTabs/_NoteTab.py
+++ b/src/DisplayTabs/_NoteTab.py
@@ -132,8 +132,10 @@ class NoteTab(GrampsTab):
     def flow_changed(self, obj):
         if obj.get_active():
             self.text.set_wrap_mode(gtk.WRAP_WORD)
+            self.note_obj.set_format(0)
         else:
             self.text.set_wrap_mode(gtk.WRAP_NONE)
+            self.note_obj.set_format(1)
 
     def rebuild(self):
         self._set_label()