diff --git a/announcement/views/oj.py b/announcement/views/oj.py
index e41a498..cb2908d 100644
--- a/announcement/views/oj.py
+++ b/announcement/views/oj.py
@@ -36,13 +36,15 @@ class MessageAPI(APIView):
             except Message.DoesNotExist:
                 return self.error("Message does not exist")
         else:
-            messages = Message.objects.filter(recipient=request.user)
+            messages = Message.objects.select_related("recipient","sender", "submission").filter(recipient=request.user)
             return self.success(self.paginate_data(request, messages, MessageListSerializer))         
     
     @validate_serializer(CreateMessageSerializer)
     @super_admin_required
     def post(self, request):
         data = request.data
+        if data["recipient"] == request.user.id:
+            return self.error("Can not send a message to youself")
         try:
             recipient = User.objects.get(id=data["recipient"], is_disabled=False)
         except User.DoesNotExist:
diff --git a/oj/settings.py b/oj/settings.py
index 74c559b..e1fa6d4 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -20,8 +20,8 @@ if production_env:
 else:
     from .dev_settings import *
 
-with open(os.path.join(DATA_DIR, "config", "secret.key"), "r") as f:
-    SECRET_KEY = f.read()
+# with open(os.path.join(DATA_DIR, "config", "secret.key"), "r") as f:
+#     SECRET_KEY = f.read()
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))