diff --git a/encryption/msgfmt.pyc b/encryption/msgfmt.pyc
index d22814856..d4d793735 100644
Binary files a/encryption/msgfmt.pyc and b/encryption/msgfmt.pyc differ
diff --git a/encryption/src/dialogs.py b/encryption/src/dialogs.py
index 2236739f6..744f10e4b 100644
--- a/encryption/src/dialogs.py
+++ b/encryption/src/dialogs.py
@@ -40,30 +40,30 @@ class PreferencesDlg:
 		try:
 			if (self.preferences.get("chk_encin_disabled", bool, True)):
 				self.glade.get_widget("chk_encin_enabled").set_active(False)
-				self.glade.get_widget("chk_encin_enabled").set_active(False)
+				self.glade.get_widget("chk_encin_forced").set_active(False)
 			elif not(self.glade.get_widget("chk_encin_enabled", bool, False)):
-				self.glade.get_widget("chk_encin_enabled").set_active(False)
-				self.glade.get_widget("chk_encin_enabled").set_active(False)
+				self.glade.get_widget("chk_encin_disabled").set_active(False)
+				self.glade.get_widget("chk_encin_forced").set_active(False)
 			elif not(self.glade.get_widget("chk_encin_forced", bool, False)):
 				self.glade.get_widget("chk_encin_enabled").set_active(False)
-				self.glade.get_widget("chk_encin_enabled").set_active(False)
+				self.glade.get_widget("chk_encin_disabled").set_active(False)
 			if(self.preferences.get("chk_encout_disabled", bool, True)):
 				self.glade.get_widget("chk_encout_enabled").set_active(False)
-				self.glade.get_widget("chk_encout_enabled").set_active(False)
+				self.glade.get_widget("chk_encout_forced").set_active(False)
 			elif not(self.glade.get_widget("chk_encout_enabled", bool, False)):
-				self.glade.get_widget("chk_encout_enabled").set_active(False)
-				self.glade.get_widget("chk_encout_enabled").set_active(False)
+				self.glade.get_widget("chk_encout_disabled").set_active(False)
+				self.glade.get_widget("chk_encout_forced").set_active(False)
 			elif not(self.glade.get_widget("chk_encout_forced", bool, False)):
 				self.glade.get_widget("chk_encout_enabled").set_active(False)
-				self.glade.get_widget("chk_encout_enabled").set_active(False)
-			
-
-				
-
-
-
-
-
+			if(self.preferences.get("chk_level_plaintext", bool, True)):
+				self.glade.get_widget("chk_level_rc4").set_active(False)
+				self.glade.get_widget("chk_level_both").set_active(False)
+			elif not(self.glade.get_widget("chk_level_both", bool, False)):
+				self.glade.get_widget("chk_level_plaintext").set_active(False)
+				self.glade.get_widget("chk_level_rc4").set_active(False)
+			elif not(self.glade.get_widget("chk_level_both", bool, False)):
+				self.glade.get_widget("chk_level_rc4").set_active(False)
+				self.glade.get_widget("chk_level_plaintext").set_active(False)
 			self.glade.get_widget("chk_prefer_rc4").set_active(self.preferences.get("prefer_rc4", bool, default=True))
 			self.glade.get_widget("chk_use_tray").set_active(self.preferences.get("enable_system_tray", bool, default=True))
 			self.glade.get_widget("chk_min_on_close").set_active(self.preferences.get("close_to_tray", bool, default=False))