diff --git a/enzevalos_iphone/persistentData/PersistentDataProvider.swift b/enzevalos_iphone/persistentData/PersistentDataProvider.swift
index 723c1ee20c4c995870b95d9f72750edc262ea806..c198ff5bd820c49695db2c931fa14e18545361ae 100644
--- a/enzevalos_iphone/persistentData/PersistentDataProvider.swift
+++ b/enzevalos_iphone/persistentData/PersistentDataProvider.swift
@@ -10,11 +10,6 @@ import CoreData
 
 /*
   TODO:
-    * add all poperties in:
-        + Mail
-        + Key
-        + Address
-    * Add Folder
     * How to handle key rcord?
     * add fetch requests:
         * Find use cases
diff --git a/enzevalos_iphone/persistentData/Properties.swift b/enzevalos_iphone/persistentData/Properties.swift
index 0de1c5e15d056bb87400447d919708acdf8251d9..e73f7ddaf64bdc6df83e7aa4746b05ea0309f0d1 100644
--- a/enzevalos_iphone/persistentData/Properties.swift
+++ b/enzevalos_iphone/persistentData/Properties.swift
@@ -13,10 +13,8 @@ protocol DataPropertyProtocol {
 
 /**
  A struct encapsulating the properties of a E-Mail.
- TODO: Folder, routing information, gmailMessageID, gmailThreadID, ThreadID, signatureKey, decryptionKey, attachments, autocrypt, xMailer
- 
- What about attached keys (public, secret keys)
- */
+ TODO: routing information, gmailMessageID, gmailThreadID, ThreadID
+  */
 struct MailProperties: DataPropertyProtocol {
     
     let entityName = "MailRecord"