diff --git a/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp b/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp
index c38fc2f1e1b90d7346e82efb326f6298dcb0b932..b0cd7e48303408e9c7f6163a588cb0d544716ba5 100644
--- a/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp
+++ b/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp
@@ -24,4 +24,4 @@ loggingAction.logEvent(TransactionType.INBOX_VIEW, loggedInMID.longValue(), 0L,
 
 </div>
 
-<%@include file="/footer.jsp" %>
+<%@include file="/footer.jsp" %>
\ No newline at end of file
diff --git a/iTrust/WebRoot/auth/hcp/menu.jsp b/iTrust/WebRoot/auth/hcp/menu.jsp
index cce925e3c8c5df00282bfb8d1eef8f5e41dbcdc5..c1212e9691732fb072d4fa64d2cb04344e734f27 100644
--- a/iTrust/WebRoot/auth/hcp/menu.jsp
+++ b/iTrust/WebRoot/auth/hcp/menu.jsp
@@ -65,7 +65,7 @@
 	<div class="panel-body" id="msg-menu">
 		<ul class="nav nav-sidebar">
 			<li><a href="/iTrust/auth/hcp/sendMessage.jsp">Compose a Message</a>
-			<li><a href="/iTrust/auth/hcp-patient/messageInbox.jsp">Message Inbox</a>
+			<li><a href="/iTrust/auth/hcp/messageInbox.jsp">Message Inbox</a>
 			<li><a href="/iTrust/auth/hcp-patient/messageOutbox.jsp">Message Outbox</a>
 		    <li><a href="/iTrust/auth/hcp-uap/showEmailHistory.jsp">Email History</a>
 		</ul>
diff --git a/iTrust/WebRoot/auth/hcp/messageInbox.jsp b/iTrust/WebRoot/auth/hcp/messageInbox.jsp
index bea87e3c3f2c84e95a34e494dc6bab7f9b9b1ade..acd87d74bbce0788cd7336a80bf3bdf059a4d116 100644
--- a/iTrust/WebRoot/auth/hcp/messageInbox.jsp
+++ b/iTrust/WebRoot/auth/hcp/messageInbox.jsp
@@ -57,7 +57,7 @@ pageTitle = "iTrust - View My Message ";
 			nf += request.getParameter("endDate");
 			
 			//Validate Filter
-			nf = action.validateAndCreateFilter(nf);
+
 			if(nf.startsWith("Error")) {
 				error = true;
 				headerMessage = nf;
@@ -68,7 +68,7 @@ pageTitle = "iTrust - View My Message ";
 					response.sendRedirect("messageInbox.jsp?edit=true&testFilter="+nf);
 				} else if(request.getParameter("save") != null) {
 					f_action.editMessageFilter(nf);
-					response.sendRedirect("messageInbox.jsp?filter=true"); 
+					response.sendRedirect("messageInbox.jsp?filter=true");
 				}
 			}
 		}
diff --git a/iTrust/WebRoot/auth/patient/menu.jsp b/iTrust/WebRoot/auth/patient/menu.jsp
index cd613b69cc9327af60c185b4968e0295d9379d6e..27cd4df3571efdda470d8e6955f0536a85bdfd1d 100644
--- a/iTrust/WebRoot/auth/patient/menu.jsp
+++ b/iTrust/WebRoot/auth/patient/menu.jsp
@@ -78,7 +78,7 @@
 	<div class="panel-body" id="msg-menu">
 		<ul class="nav nav-sidebar">
 			<li><a href="/iTrust/auth/patient/sendMessage.jsp">Compose a Message</a>
-			<li><a href="/iTrust/auth/hcp-patient/messageInbox.jsp">Message Inbox</a>
+			<li><a href="/iTrust/auth/patient/messageInbox.jsp">Message Inbox</a>
 			<li><a href="/iTrust/auth/hcp-patient/messageOutbox.jsp">Message Outbox</a>
 		</ul>
 	</div>
diff --git a/iTrust/WebRoot/auth/patient/messageInbox.jsp b/iTrust/WebRoot/auth/patient/messageInbox.jsp
index 4eec68b03535e63ff95bf56208249b8b9f499c3e..3dab22f8e9fd2fe439a6e9bb33d46e2483d2f6c9 100644
--- a/iTrust/WebRoot/auth/patient/messageInbox.jsp
+++ b/iTrust/WebRoot/auth/patient/messageInbox.jsp
@@ -5,6 +5,7 @@
 <%@page import="edu.ncsu.csc.itrust.action.ViewMyMessagesAction"%>
 <%@page import="edu.ncsu.csc.itrust.action.EditPatientAction"%>
 <%@page import="edu.ncsu.csc.itrust.beans.MessageBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
 <%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
 <%@page import="edu.ncsu.csc.itrust.dao.mysql.PatientDAO"%>
 <%@page import="java.util.ArrayList"%>
@@ -55,7 +56,6 @@ pageTitle = "iTrust - View My Message ";
 			nf += request.getParameter("endDate");
 			
 			//Validate Filter
-			nf = action.validateAndCreateFilter(nf);
 			if(nf.startsWith("Error")) {
 				error = true;
 				headerMessage = nf;
@@ -260,4 +260,4 @@ pageTitle = "iTrust - View My Message ";
 	<br />
 </div>
 
-<%@include file="/footer.jsp" %>
+<%@include file="/footer.jsp" %>
\ No newline at end of file
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
index 45ff96223e9275c061899c143b6d859823dd6b70..fe355018b332817206ec088c95c5eda06c0f8632 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
@@ -161,4 +161,16 @@ public class EditPatientAction extends PatientBaseAction {
 		
 		return true;
 	}
-}
+
+	/**
+	 * Updates patient info to filter
+	 * @param nf The filter
+	 * @throws ITrustException
+	 * @throws FormValidationException
+	 */
+	public void editMessageFilter(String nf) throws ITrustException, FormValidationException {
+		PatientBean p = patientDAO.getPatient(this.getPid());
+		p.setMessageFilter(nf);
+		this.updateInformation(p);		
+	}
+}
\ No newline at end of file
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java
index 0d04d6e920b0bb185b497fe11062256c882a9684..01b6f147afedb2ef12240286e0f28f9431dc5bcb 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java
@@ -60,5 +60,17 @@ public class EditPersonnelAction extends PersonnelBaseAction {
 		validator.validate(personnelForm);
 		personnelDAO.editPersonnel(personnelForm);
 	}
+
+	/**
+	 * Updates the personnel info to filter
+	 * @param fn The filter
+	 * @throws ITrustException
+	 * @throws FormValidationException
+	 */
+	public void editMessageFilter(String nf) throws ITrustException, FormValidationException {
+		PersonnelBean p = personnelDAO.getPersonnel(this.getPid());
+	    p.setMessageFilter(nf);
+        this.updateInformation(p);		
+	}
 	
 }
diff --git a/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java b/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java
index 64b8b0f1321272964cf6c18a200b62e18bed5a38..a563644763999f613610fe249348658345eb9eed 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java
@@ -61,7 +61,15 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 	private String spiritualPractices = "";
 	private String alternateName = "";
 	private String dateOfDeactivationStr = "";
+	private String messageFilter= "";
 
+	public void setMessageFilter(String nf) {
+	    this.messageFilter = nf;
+    }
+	
+	public String getMessageFilter(){
+		return messageFilter;
+	}
 
 	public BloodType getBloodType() {
 		return bloodType;
diff --git a/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java b/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java
index a073981b3b15cf1e7c52cea3831bf2012aa5e97f..efc86b2db1ea0d599ce2b8f5c941b7c21d6a46c3 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java
@@ -32,6 +32,15 @@ public class PersonnelBean implements Serializable {
 	private String phone = "";
 	private String email = "";
 	private String specialty = "";
+	private String messageFilter= "";
+	
+	public String getMessageFilter(){
+		return messageFilter;
+	}
+
+	public void setMessageFilter(String nf) {
+	    this.messageFilter = nf;
+    }
 
 	public String getEmail() {
 		return email;