diff --git a/Mailnag/daemon/mailchecker.py b/Mailnag/daemon/mailchecker.py
index 2e628f0..189cffa 100644
--- a/Mailnag/daemon/mailchecker.py
+++ b/Mailnag/daemon/mailchecker.py
@@ -40,11 +40,11 @@ def try_call(f, err_retval = None):
 
 
 class MailChecker:
-	def __init__(self, cfg, reminder, hookreg):
+	def __init__(self, cfg, memorizer, hookreg):
 		self._firstcheck = True # first check after startup
 		self._mailcheck_lock = threading.Lock()
 		self._mailsyncer = MailSyncer(cfg)
-		self._reminder = reminder
+		self._memorizer = memorizer
 		self._hookreg = hookreg
 		
 	
@@ -66,8 +66,8 @@ class MailChecker:
 			new_mails = []
 			
 			for mail in all_mails:
-				if self._reminder.contains(mail.id): # mail was fetched before
-					if self._reminder.is_unseen(mail.id): # mail was not marked as seen
+				if self._memorizer.contains(mail.id): # mail was fetched before
+					if self._memorizer.is_unseen(mail.id): # mail was not marked as seen
 						unseen_mails.append(mail)
 						if self._firstcheck:
 							new_mails.append(mail)
@@ -76,8 +76,8 @@ class MailChecker:
 					unseen_mails.append(mail)
 					new_mails.append(mail)
 			
-			self._reminder.sync(all_mails)
-			self._reminder.save()
+			self._memorizer.sync(all_mails)
+			self._memorizer.save()
 			self._firstcheck = False
 			
 			# apply filter plugin hooks
diff --git a/Mailnag/daemon/mailnagdaemon.py b/Mailnag/daemon/mailnagdaemon.py
index 731930c..a95dbb7 100644
--- a/Mailnag/daemon/mailnagdaemon.py
+++ b/Mailnag/daemon/mailnagdaemon.py
@@ -26,7 +26,7 @@ import logging
 
 from common.accounts import AccountList
 from daemon.mailchecker import MailChecker
-from daemon.mails import Reminder
+from daemon.mails import Memorizer
 from daemon.idlers import IdlerRunner
 from common.plugins import Plugin, HookRegistry, MailnagController
 from common.exceptions import InvalidOperationException
@@ -67,15 +67,15 @@ class MailnagDaemon:
 			self._accounts.load_from_cfg(self._cfg, enabled_only = True)
 
 			hook_registry = HookRegistry()
-			reminder = Reminder()
-			reminder.load()			
+			memorizer = Memorizer()
+			memorizer.load()
 
-			self._mailchecker = MailChecker(self._cfg, reminder, hook_registry)
+			self._mailchecker = MailChecker(self._cfg, memorizer, hook_registry)
 
 			# Note: all code following _load_plugins() should be executed
 			# asynchronously because the dbus plugin requires an active mainloop
 			# (usually started in the programs main function).
-			self._load_plugins(reminder, hook_registry)
+			self._load_plugins(memorizer, hook_registry)
 
 			# Start checking for mails asynchronously.
 			self._start_thread = threading.Thread(target = self._start)
@@ -201,11 +201,11 @@ class MailnagDaemon:
 				self._fatal_error_handler(ex)
 	
 
-	def _load_plugins(self, reminder, hookreg):
+	def _load_plugins(self, memorizer, hookreg):
 		class MailnagController_Impl(MailnagController):
-			def __init__(self, daemon, reminder, hookreg, shutdown_request_hdlr):
+			def __init__(self, daemon, memorizer, hookreg, shutdown_request_hdlr):
 				self._daemon = daemon
-				self._reminder = reminder
+				self._memorizer = memorizer
 				self._hookreg = hookreg
 				self._shutdown_request_handler = shutdown_request_hdlr
 				
@@ -221,13 +221,13 @@ class MailnagDaemon:
 			
 			def mark_mail_as_read(self, mail_id):
 				# Note: ensure_valid_state() is not really necessary here
-				# (the reminder object is available in init() and dispose()), 
+				# (the memorizer object is available in init() and dispose()), 
 				# but better be consistent with other daemon methods.
 				self._daemon._ensure_valid_state()
-				self._reminder.set_to_seen(mail_id)
-				self._reminder.save()
+				self._memorizer.set_to_seen(mail_id)
+				self._memorizer.save()
 		
-		controller = MailnagController_Impl(self, reminder, hookreg, self._shutdown_request_handler)
+		controller = MailnagController_Impl(self, memorizer, hookreg, self._shutdown_request_handler)
 	
 		enabled_lst = self._cfg.get('core', 'enabled_plugins').split(',')
 		enabled_lst = filter(lambda s: s != '', map(lambda s: s.strip(), enabled_lst))
diff --git a/Mailnag/daemon/mails.py b/Mailnag/daemon/mails.py
index d00113c..f0845b4 100644
--- a/Mailnag/daemon/mails.py
+++ b/Mailnag/daemon/mails.py
@@ -338,9 +338,9 @@ def sort_mails(mail_list, sort_desc = False):
 
 
 #
-# Reminder class
+# Memorizer class
 #
-class Reminder(dict):
+class Memorizer(dict):
 	def __init__(self):
 		dict.__init__(self)
 		self._changed = False
@@ -384,7 +384,7 @@ class Reminder(dict):
 	def sync(self, mail_list):
 		for m in mail_list:
 			if not m.id in self:
-				# new mail is not yet known to the reminder
+				# new mail is not yet known to the memorizer
 				self[m.id] = '0'
 				self._changed = True
 		
@@ -400,7 +400,7 @@ class Reminder(dict):
 				self._changed = True
 	
 	
-	# check if mail id is in reminder list
+	# check if mail id is in the memorizer list
 	def contains(self, id):
 		return (id in self)