1 files changed, 2 insertions, 1 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
index 9e022557..ea81b5e0 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
@@ -254,7 +254,8 @@ public class NewMessage {
         com.juick.Message jmsg = messagesService.getReply(mid, ridnew);
         xmsg.addExtension(jmsg);
 
-        String quote = reply != null ? reply.getText() : msg.getText();
+        String quote = reply != null ? StringUtils.defaultString(reply.getText())
+                : StringUtils.defaultString(msg.getText());
         if (quote.length() >= 50) {
             quote = quote.substring(0, 47) + "...";
         }