diff --git a/NFCServer.iml b/NFCServer.iml
index b8be68a..d5fa6ee 100644
--- a/NFCServer.iml
+++ b/NFCServer.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="D:\NFCapp_SERVER" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration>
@@ -24,8 +24,8 @@
           <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
         </webroots>
         <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/resources" />
           <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
         </sourceRoots>
       </configuration>
     </facet>
diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java
index 8aba161..6e3c5f6 100644
--- a/src/main/java/application/controllers/UserController.java
+++ b/src/main/java/application/controllers/UserController.java
@@ -103,6 +103,22 @@ public class UserController {
         return loginResponse.toString();
     }
 
+    @RequestMapping(value = "/markMessageAsRead/{userId}/{messageId}")
+    @ResponseBody
+    public String markMessageAsRead(@PathVariable("userId") long userId, @PathVariable("messageId") long messageId) throws JSONException{
+        User user = userRepository.findOne(userId);
+        Set<Message> messages = user.getMessages();
+
+        for(Message message : messages){
+            if(message.getMessageId() == messageId){
+                message.setRead(true);
+            }
+        }
+
+        userRepository.save(user);
+        return (new JSONObject()).put("success", true).toString();
+    }
+
     @RequestMapping("/addMe")
     @ResponseBody
     public String addMe() {
diff --git a/src/main/java/application/model/Message.java b/src/main/java/application/model/Message.java
index e33267b..90f9ebd 100644
--- a/src/main/java/application/model/Message.java
+++ b/src/main/java/application/model/Message.java
@@ -60,4 +60,8 @@ public class Message {
     public Long getMessageId() {
         return messageId;
     }
+
+    public void setMessageId(Long messageId) {
+        this.messageId = messageId;
+    }
 }