diff --git a/src/main/java/com/google/codeu/servlets/MessageServlet.java b/src/main/java/com/google/codeu/servlets/MessageServlet.java
index 0361119..7eb4da1 100644
--- a/src/main/java/com/google/codeu/servlets/MessageServlet.java
+++ b/src/main/java/com/google/codeu/servlets/MessageServlet.java
@@ -76,9 +76,14 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     }
     String recipient = request.getParameter("recipient");
     String user = userService.getCurrentUser().getEmail();
-    String text = Jsoup.clean(request.getParameter("text"), Whitelist.none());
-
-    Message message = new Message(user, text, recipient);
+    String userText = Jsoup.clean(request.getParameter("text"), Whitelist.none());
+    
+    String regex = "(https?://(\\w+[/|.|-]?)+\\.(bmp|png|jpg|gif|jpeg|tiff)).*";
+    
+    String replacement = "<img src=\"$1\" />";
+    String textWithImagesReplaced = userText.replaceAll(regex, replacement);
+        
+    Message message = new Message(user, textWithImagesReplaced);
     datastore.storeMessage(message);
 
     response.sendRedirect("/user-page.html?user=" + recipient);