diff --git a/src/main/java/org/websoso/WSSServer/service/CommentService.java b/src/main/java/org/websoso/WSSServer/service/CommentService.java
index ddc9e189..ef7f8218 100644
--- a/src/main/java/org/websoso/WSSServer/service/CommentService.java
+++ b/src/main/java/org/websoso/WSSServer/service/CommentService.java
@@ -63,7 +63,7 @@ private void sendCommentPushMessageToFeedOwner(User user, Feed feed) {
         NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("댓글");
 
         String notificationTitle = createNotificationTitle(feed);
-        String notificationBody = String.format("%s님이 내 수다글에 댓글을 남겼어요", user.getNickname());
+        String notificationBody = String.format("%s님이 내 수다글에 댓글을 남겼어요.", user.getNickname());
         Long feedId = feed.getFeedId();
 
         Notification notification = Notification.create(
@@ -99,9 +99,10 @@ private void sendCommentPushMessageToFeedOwner(User user, Feed feed) {
     private String createNotificationTitle(Feed feed) {
         if (feed.getNovelId() == null) {
             String feedContent = feed.getFeedContent();
-            return feedContent.length() <= 12
+            feedContent = feedContent.length() <= 12
                     ? feedContent
-                    : "'" + feedContent.substring(0, 12) + "...'";
+                    : feedContent.substring(0, 12);
+            return "'" + feedContent + "...'";
         }
         Novel novel = novelService.getNovelOrException(feed.getNovelId());
         return novel.getTitle();
diff --git a/src/main/java/org/websoso/WSSServer/service/FeedService.java b/src/main/java/org/websoso/WSSServer/service/FeedService.java
index 73039343..fd417179 100644
--- a/src/main/java/org/websoso/WSSServer/service/FeedService.java
+++ b/src/main/java/org/websoso/WSSServer/service/FeedService.java
@@ -171,9 +171,10 @@ private void sendLikePushMessage(User liker, Feed feed) {
     private String createNotificationTitle(Feed feed) {
         if (feed.getNovelId() == null) {
             String feedContent = feed.getFeedContent();
-            return feedContent.length() <= 12
+            feedContent = feedContent.length() <= 12
                     ? feedContent
-                    : "'" + feedContent.substring(0, 12) + "...'";
+                    : feedContent.substring(0, 12);
+            return "'" + feedContent + "...'";
         }
         Novel novel = novelService.getNovelOrException(feed.getNovelId());
         return novel.getTitle();
diff --git a/src/main/java/org/websoso/WSSServer/service/PopularFeedService.java b/src/main/java/org/websoso/WSSServer/service/PopularFeedService.java
index d5fefb21..7911ab2a 100644
--- a/src/main/java/org/websoso/WSSServer/service/PopularFeedService.java
+++ b/src/main/java/org/websoso/WSSServer/service/PopularFeedService.java
@@ -82,9 +82,10 @@ private String createNotificationBody(Feed feed) {
     private String generateNotificationBodyFragment(Feed feed) {
         if (feed.getNovelId() == null) {
             String feedContent = feed.getFeedContent();
-            return feedContent.length() <= 12
+            feedContent = feedContent.length() <= 12
                     ? feedContent
-                    : "'" + feedContent.substring(0, 12) + "...'";
+                    : feedContent.substring(0, 12);
+            return "'" + feedContent + "...'";
         }
         Novel novel = novelService.getNovelOrException(feed.getNovelId());
         return String.format("<%s>", novel.getTitle());