diff --git a/Common/Options.cpp b/Common/Options.cpp
index 84f23ce4b013d0dc1951c13a08e6bb96de283c6c..b090378df1ec6f0c529e2503274cd26d297858ff 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.322 2006-12-03 18:04:11 geuzaine Exp $
+// $Id: Options.cpp,v 1.323 2006-12-16 05:43:20 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -228,12 +228,11 @@ void Print_Options(int num, int level, int diff, int help, char *filename)
   if((level & GMSH_SESSIONRC) && file) {
     fprintf(file, "// Gmsh Session File\n");
     fprintf(file, "//\n");
-    fprintf(file, "// This file contains session specific info (that is info\n");
-    fprintf(file, "// you want to keep between two Gmsh sessions). You are\n");
-    fprintf(file, "// not supposed to edit it manually, but of course you\n");
-    fprintf(file, "// can. This file will be entirely rewritten every time\n");
-    fprintf(file, "// you quit Gmsh if the option 'General.SaveSession' is\n");
-    fprintf(file, "// set.\n");
+    fprintf(file, "// This file contains session specific info (that is info you\n");
+    fprintf(file, "// want to keep between two Gmsh sessions). You are not supposed\n");
+    fprintf(file, "// to edit it manually, but of course you can. This file will be\n");
+    fprintf(file, "// entirely rewritten every time you quit Gmsh if the option \n");
+    fprintf(file, "// 'General.SaveSession' is set.\n");
     fprintf(file, "//\n");
   }
 
@@ -243,9 +242,9 @@ void Print_Options(int num, int level, int diff, int help, char *filename)
     fprintf(file, "// This file contains configuration options (preferences) that\n");
     fprintf(file, "// are loaded each time Gmsh is launched. You can create this\n");
     fprintf(file, "// file by hand, or let Gmsh generate it for you (with\n");
-    fprintf(file, "// 'Tools->Options->Save'). This file can also be automatically\n");
-    fprintf(file, "// saved every time you quit Gmsh if the option 'General.SaveOptions'\n");
-    fprintf(file, "// is set.\n");
+    fprintf(file, "// 'Tools->Options->Save as default'). This file can also be\n");
+    fprintf(file, "// automatically saved every time you quit Gmsh if the option\n");
+    fprintf(file, "// 'General.SaveOptions' is set.\n");
     fprintf(file, "//\n");
   }
 
diff --git a/Fltk/GUI_Extras.cpp b/Fltk/GUI_Extras.cpp
index 5085d2ec7320f53cfd94ae35a995625b0e15fa68..04ba05ece340fc8a59bbc4cd1218e3431f92a63a 100644
--- a/Fltk/GUI_Extras.cpp
+++ b/Fltk/GUI_Extras.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI_Extras.cpp,v 1.28 2006-11-27 22:22:10 geuzaine Exp $
+// $Id: GUI_Extras.cpp,v 1.29 2006-12-16 05:43:20 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -562,7 +562,7 @@ int options_dialog(char *name)
     dialog->b[0]->value(1);
     dialog->b[0]->type(FL_TOGGLE_BUTTON);
     dialog->b[1] = new Fl_Check_Button(WB, y, 2 * BB + WB, BH, "Print help strings"); y += BH;
-    dialog->b[1]->value(1);
+    dialog->b[1]->value(0);
     dialog->b[1]->type(FL_TOGGLE_BUTTON);
     dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
     dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
diff --git a/Fltk/Message.cpp b/Fltk/Message.cpp
index 4f28317fa8e5b77435bc14dd4d043627ac24bc1d..15acd8fa8c7ba7e4d462755f6da065ff85a76b1a 100644
--- a/Fltk/Message.cpp
+++ b/Fltk/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.77 2006-11-27 22:22:10 geuzaine Exp $
+// $Id: Message.cpp,v 1.78 2006-12-16 05:43:20 geuzaine Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -240,10 +240,10 @@ void Exit(int level)
       CTX.solver_position[1] = WID->solver[0].window->y();
       file_chooser_get_position(&CTX.file_chooser_position[0],
 				&CTX.file_chooser_position[1]);
-      Print_Options(0, GMSH_SESSIONRC, 0, 1, CTX.session_filename_fullpath);
+      Print_Options(0, GMSH_SESSIONRC, 0, 0, CTX.session_filename_fullpath);
     }
     if(CTX.options_save)
-      Print_Options(0, GMSH_OPTIONSRC, 1, 1, CTX.options_filename_fullpath);
+      Print_Options(0, GMSH_OPTIONSRC, 1, 0, CTX.options_filename_fullpath);
   }
 
   exit(0);