2 files changed, 4 insertions, 29 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 11e0f812c..b1cba33af 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -596,7 +596,7 @@ function closeMenu(theID) {
 }
 
 function markRead(notifType) {
-	$.get('ping?f=&markRead='+notifType);
+	$.get('notifications?f=&markRead='+notifType);
 	$('.' + notifType + '-button').fadeOut(function() {
 		$("." + notifType + "-update").html('0');
 		$('#nav-' + notifType + '-menu').html('');
@@ -607,7 +607,7 @@ function markRead(notifType) {
 }
 
 function markItemRead(itemId) {
-	$.get('ping?f=&markItemRead='+itemId);
+	$.get('notifications?f=&markItemRead='+itemId);
 	$('.unseen-wall-indicator-'+itemId).remove();
 }
 
@@ -1505,24 +1505,6 @@ function preview_post() {
 	return true;
 }
 
-function preview_mail() {
-	$("#mail-preview").val("1");
-	$("#mail-preview-content").show();
-	$.post(
-		"mail",
-		$("#prvmail-form").serialize(),
-		function(data) {
-			if(data.preview) {
-				$("#mail-preview-content").html(data.preview);
-				$("#mail-preview-content" + " a").click(function() { return false; });
-			}
-		},
-		"json"
-	);
-	$("#mail-preview").val("0");
-	return true;
-}
-
 function bin2hex(s) {
 	// Converts the binary representation of data to hex
 	//
@@ -1876,7 +1858,7 @@ function sse_bs_notifications(e, replace, followup) {
 
 function sse_handleNotifications(obj, replace, followup) {
 
-	var primary_notifications = ['dm', 'home', 'intros', 'register', 'mail', 'notify', 'files'];
+	var primary_notifications = ['dm', 'home', 'intros', 'register', 'notify', 'files'];
 	var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
 	var all_notifications = primary_notifications.concat(secondary_notifications);
 
@@ -2010,7 +1992,7 @@ function sse_updateNotifications(type, mid) {
 }
 
 function sse_setNotificationsStatus() {
-	var primary_notifications = ['dm', 'home', 'intros', 'register', 'mail', 'notify', 'files'];
+	var primary_notifications = ['dm', 'home', 'intros', 'register', 'notify', 'files'];
 	var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
 	var all_notifications = primary_notifications.concat(secondary_notifications);
 
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
deleted file mode 100644
index 917e5414c..000000000
--- a/view/js/mod_mail.js
+++ /dev/null
@@ -1,7 +0,0 @@
-$(document).ready(function() { 
-	$("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) {
-		$("#recip-complete").val(data.xid);
-	});
-	$('#prvmail-text').bbco_autocomplete('bbcode');
-	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-});