diff --git a/CASA/gui/CommonGUI.cs b/CASA/gui/CommonGUI.cs
index 4840464c..f3ed3a3a 100644
--- a/CASA/gui/CommonGUI.cs
+++ b/CASA/gui/CommonGUI.cs
@@ -41,6 +41,7 @@ namespace Novell.CASA.GUI
 		
 		public static string HINT_DIR = "Export Directory";
 		public static string HINT_FILENAME = "Export Filename";
+		public static string REMEMBER_SETTING = "Remember_Master_Password_Time";
 
 		[Glade.Widget] 
 		Gtk.Label			label86,
@@ -216,7 +217,20 @@ namespace Novell.CASA.GUI
 			}
 		}
 
-#if W32
+		// remember MP until functions
+		private static DateTime m_dtRememberUntil = new DateTime(0);
+		public static void SetRememberMPUntil(DateTime dtDateTime)
+		{
+			m_dtRememberUntil = dtDateTime;
+		}
+		
+		public static DateTime GetRememberMPUntil()
+		{
+			return m_dtRememberUntil;
+		}
+
+
+#if GTK2x
 		public static string FileChooser(FileChooserAction action, String sWindowTitle, String sCurrentFolder, String sHintFileName)
 		{
 			FileChooserDialog chooser = new FileChooserDialog (sWindowTitle,