diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index b5a9854c5..5a7b0d980 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,8 @@
 2006-09-25  Don Allingham  <don@gramps-project.org>
+	* src/ViewManager.py: fix message
+	* src/Config/_GrampsConfigKeys.py: set default value
+	* src/QuestionDialog.py: set value from config
+	* data/gramps.schemas.in: fix default value
 	* src/GrampsDb/_GrampsDBCallback.py: catch db transaction problem
 	* src/GrampsCfg.py: reset PORT_WARN when TRANSACTION re-enabled
 	* src/QuestionDialog.py: sync changes to config value
diff --git a/gramps2/data/gramps.schemas.in b/gramps2/data/gramps.schemas.in
index 220dea372..9be378d8c 100644
--- a/gramps2/data/gramps.schemas.in
+++ b/gramps2/data/gramps.schemas.in
@@ -673,11 +673,11 @@
       </schema>
 
       <schema>
-        <key>/schemas/apps/gramps/behavior/port-warn</key>
-        <applyto>/apps/gramps/behavior/port-warn</applyto>
+        <key>/schemas/apps/gramps/preferences/port-warn</key>
+        <applyto>/apps/gramps/preferences/port-warn</applyto>
         <owner>gramps</owner>
         <type>bool</type>
-        <default>1</default>
+        <default>0</default>
         <locale name="C">
           <short>Enables the display of portability warning</short>
           <long>Enables the display of portability warning.</long>
diff --git a/gramps2/src/Config/_GrampsConfigKeys.py b/gramps2/src/Config/_GrampsConfigKeys.py
index c7cac6eda..76db6e25c 100644
--- a/gramps2/src/Config/_GrampsConfigKeys.py
+++ b/gramps2/src/Config/_GrampsConfigKeys.py
@@ -86,7 +86,7 @@ default_value = {
     TODO_COLOR           : '#ff0000',
     CUSTOM_MARKER_COLOR  : '#8b008b',
     FAMILY_WARN          : True,
-    PORT_WARN            : True,
+    PORT_WARN            : False,
     HIDE_EP_MSG          : False,
     LAST_VIEW            : 0,
     FAMILY_SIBLINGS      : True,
diff --git a/gramps2/src/QuestionDialog.py b/gramps2/src/QuestionDialog.py
index 0458e2e4e..e6192b1b1 100644
--- a/gramps2/src/QuestionDialog.py
+++ b/gramps2/src/QuestionDialog.py
@@ -262,6 +262,7 @@ class MessageHideDialog:
         glade_xml = gtk.glade.XML(const.gladeFile, "hide_dialog", "gramps")
         top = glade_xml.get_widget('hide_dialog')
         dont_show = glade_xml.get_widget('dont_show')
+        dont_show.set_active(Config.get(key))
         title_label = glade_xml.get_widget('title')
         title_label.set_text(
             '<span size="larger" weight="bold">%s</span>' % title)
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index 849f7c1de..633d726cb 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -1054,22 +1054,21 @@ def check_for_portability_problems(filetype):
         # sys.version_info variable
         
         version = (sys.version_info[0],sys.version_info[1])
-
-        if version < (2, 5) and Config.get(Config.PORT_WARN):
+        if version < (2, 5) and not Config.get(Config.PORT_WARN):
             QuestionDialog.MessageHideDialog(
                 _('Database is not portable'),
                 _('Your system is running an old version of python. This '
                   'prevents you from being able to copy your database to '
                   'other machines. For most people, this is not a problem.\n\n'
                   'If you need to transfer the database to another machine, '
-                  'export to GRAMPS Package, and import the GRAMPS Package '
+                  'export to a GRAMPS Package, and import the GRAMPS Package '
                   'on the other machine.\n\nIf you feel you need to be able '
                   'to transfer this file between machines without exporting, '
                   'you need to either upgrade to version 2.5 of python, or '
                   'disable transactions in the preferences menu. Disabling '
-                  'transactions will slow down your performance, and may allow '
-                  'your database to become corrupted if an error occurs while '
-                  'data is being saved'),
+                  'transactions will slow down your performance, and may '
+                  'allow your database to become corrupted if an error '
+                  'occurs while data is being saved'),
                 Config.PORT_WARN)