diff --git a/frappe/desk/doctype/feed/feed.py b/frappe/desk/doctype/feed/feed.py
index e01d571480..4c4f9f1bf5 100644
--- a/frappe/desk/doctype/feed/feed.py
+++ b/frappe/desk/doctype/feed/feed.py
@@ -56,7 +56,7 @@ def update_feed(doc, method=None):
 	if doc.doctype == "Feed":
 		return
 
-	if frappe.flags.in_patch or frappe.flags.in_install_app:
+	if frappe.flags.in_patch or frappe.flags.in_install_app or frappe.flags.in_import:
 		return
 
 
diff --git a/frappe/desk/doctype/todo/todo.json b/frappe/desk/doctype/todo/todo.json
index b0651dcd78..97983054e4 100644
--- a/frappe/desk/doctype/todo/todo.json
+++ b/frappe/desk/doctype/todo/todo.json
@@ -170,7 +170,7 @@
  "in_dialog": 0,
  "issingle": 0,
  "max_attachments": 0,
- "modified": "2014-06-30 05:40:15.471435",
+ "modified": "2014-06-30 05:40:15.471437",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "ToDo",
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 1996e9db0d..ecbc62036a 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -5,7 +5,9 @@ execute:frappe.reload_doc('core', 'doctype', 'docperm') #2014-06-04
 execute:frappe.reload_doc('core', 'doctype', 'page') #2013-13-26
 execute:frappe.reload_doc('core', 'doctype', 'report') #2014-06-03
 execute:frappe.reload_doc('core', 'doctype', 'version') #2014-02-21
-execute:frappe.reload_doc('core', 'doctype', 'email_alert') #2014-07-15
+execute:frappe.reload_doc('email', 'doctype', 'email_alert') #2014-07-15
+execute:frappe.reload_doc('desk', 'doctype', 'todo') #2014-12-31
+execute:frappe.reload_doc('custom', 'doctype', 'property_setter') #2014-12-31
 execute:frappe.db.sql("alter table `tabSessions` modify `user` varchar(255), engine=InnoDB")
 execute:frappe.db.sql("delete from `tabDocField` where parent='0'")
 frappe.patches.v4_0.change_varchar_length