1 files changed, 3 insertions, 0 deletions
diff --git a/juick-server/src/main/java/com/juick/server/EmailManager.java b/juick-server/src/main/java/com/juick/server/EmailManager.java
index aaebaac8..66e84358 100644
--- a/juick-server/src/main/java/com/juick/server/EmailManager.java
+++ b/juick-server/src/main/java/com/juick/server/EmailManager.java
@@ -45,6 +45,9 @@ public class EmailManager implements ApplicationListener<MessageEvent> {
     public void onApplicationEvent(@Nonnull MessageEvent event) {
         Message msg = event.getMessage();
         List<User> subscribedUsers = event.getUsers();
+        if (msg.isService()) {
+            return;
+        }
         if (MessageUtils.isPM(msg)) {
             String subject = String.format("Private message from %s", msg.getUser().getName());
             emailService.getEmails(msg.getTo().getUid(), true).forEach(email -> {