diff --git a/erpnext/patches/may_2012/cleanup_notification_control.py b/erpnext/patches/may_2012/cleanup_notification_control.py
new file mode 100644
index 0000000..ef65250
--- /dev/null
+++ b/erpnext/patches/may_2012/cleanup_notification_control.py
@@ -0,0 +1,28 @@
+def execute():
+	import webnotes
+	webnotes.conn.sql("""
+		delete from `tabSingles`
+		where doctype='Notification Control'
+		and field in (
+			'payable_voucher',
+			'payment_received_message',
+			'payment_sent_message',
+			'enquiry')
+	""")
+	ren_list = [
+		['expense_voucher', 'expense_claim'],
+		['receivable_voucher', 'sales_invoice'],
+		['enquiry', 'opportunity'],
+	]
+	for r in ren_list:
+		webnotes.conn.sql("""
+			update `tabSingles`
+			set field=%s
+			where field=%s
+			and doctype='Notification Control'
+		""", (r[1], r[0]))
+	
+	webnotes.conn.commit()
+	webnotes.conn.begin()
+	import webnotes.model.sync
+	webnotes.model.sync.sync('setup', 'notification_control')
\ No newline at end of file
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index f5c98bc..d6d689f 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -322,5 +322,10 @@
 		'patch_file': 'rename_prev_doctype',
 		'description': 'rename prev doctype fix'
 	},
+	{
+		'patch_module': 'patches.may_2012',
+		'patch_file': 'cleanup_notification_control',
+		'description': 'cleanup notification control'
+	},
 
 ]
diff --git a/erpnext/setup/doctype/notification_control/notification_control.js b/erpnext/setup/doctype/notification_control/notification_control.js
index 5512697..958ed0b 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.js
+++ b/erpnext/setup/doctype/notification_control/notification_control.js
@@ -37,7 +37,8 @@
 				if(user!='Administrator') {
 					return user;
 				} else {
-					return (wn.control_panel.auto_email_id || 'automail@erpnext.com');
+					return (wn.control_panel.auto_email_id || 
+						'ERPNext Notification<automail@erpnext.com>');
 				}
 			})();
 			if(res.send) {
diff --git a/erpnext/setup/doctype/notification_control/notification_control.txt b/erpnext/setup/doctype/notification_control/notification_control.txt
index 49526ca..000902e 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.txt
+++ b/erpnext/setup/doctype/notification_control/notification_control.txt
@@ -3,9 +3,9 @@
 
 	# These values are common in all dictionaries
 	{
-		'creation': '2012-03-27 14:36:22',
+		'creation': '2012-05-03 16:16:21',
 		'docstatus': 0,
-		'modified': '2012-03-27 14:36:22',
+		'modified': '2012-05-03 16:23:29',
 		'modified_by': u'Administrator',
 		'owner': u'Administrator'
 	},
@@ -22,7 +22,7 @@
 		'name': '__common__',
 		'section_style': u'Simple',
 		'server_code_error': u' ',
-		'version': 79
+		'version': 1
 	},
 
 	# These values are common for all DocField
@@ -88,16 +88,6 @@
 	# DocField
 	{
 		'doctype': u'DocField',
-		'fieldname': u'enquiry',
-		'fieldtype': u'Check',
-		'hidden': 1,
-		'label': u'Opportunity',
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
 		'fieldname': u'quotation',
 		'fieldtype': u'Check',
 		'label': u'Quotation'
@@ -122,7 +112,7 @@
 	# DocField
 	{
 		'doctype': u'DocField',
-		'fieldname': u'receivable_voucher',
+		'fieldname': u'sales_invoice',
 		'fieldtype': u'Check',
 		'label': u'Sales Invoice'
 	},
@@ -155,16 +145,7 @@
 	# DocField
 	{
 		'doctype': u'DocField',
-		'fieldname': u'payable_voucher',
-		'fieldtype': u'Check',
-		'label': u'Purchase Invoice',
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'expense_voucher',
+		'fieldname': u'expense_claim',
 		'fieldtype': u'Check',
 		'label': u'Expense Claim'
 	},
@@ -184,7 +165,7 @@
 		'fieldname': u'select_transaction',
 		'fieldtype': u'Select',
 		'label': u'Select Transaction',
-		'options': u'\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPayment Received\nPurchase Order\nPurchase Receipt\nPayment Sent',
+		'options': u'\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPurchase Order\nPurchase Receipt\nExpense Claim\nExpense Claim Approved\nExpense Claim Rejected',
 		'trigger': u'Client'
 	},
 
@@ -248,16 +229,6 @@
 	# DocField
 	{
 		'doctype': u'DocField',
-		'fieldname': u'payment_received_message',
-		'fieldtype': u'Text',
-		'hidden': 1,
-		'label': u'Payment Received Message',
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
 		'fieldname': u'purchase_order_message',
 		'fieldtype': u'Text',
 		'hidden': 1,
@@ -278,17 +249,7 @@
 	# DocField
 	{
 		'doctype': u'DocField',
-		'fieldname': u'payment_sent_message',
-		'fieldtype': u'Text',
-		'hidden': 1,
-		'label': u'Payment Sent Message',
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'expense_voucher_approved_message',
+		'fieldname': u'expense_claim_approved_message',
 		'fieldtype': u'Text',
 		'hidden': 1,
 		'label': u'Expense Claim Approved Message',
@@ -298,7 +259,7 @@
 	# DocField
 	{
 		'doctype': u'DocField',
-		'fieldname': u'expense_voucher_rejected_message',
+		'fieldname': u'expense_claim_rejected_message',
 		'fieldtype': u'Text',
 		'hidden': 1,
 		'label': u'Expense Claim Rejected Message',