diff -r a788bf0e1080 -r f04253b2d6c1 src/org/sonews/storage/impl/DrupalDatabase.java --- a/src/org/sonews/storage/impl/DrupalDatabase.java Thu Oct 20 10:50:58 2011 +0200 +++ b/src/org/sonews/storage/impl/DrupalDatabase.java Sun Oct 30 22:10:43 2011 +0100 @@ -419,7 +419,11 @@ String text = m.getBodyXhtmlFragment(); if (subject == null || subject.length() < 1) { - subject = text.substring(0, Math.min(10, text.length())); + String plainText = m.getBodyPlainText(); + subject = plainText.substring(0, Math.min(32, plainText.length())); + if (subject.length() < plainText.length()) { + subject = subject + "…"; + } } insertArticle(article.getAuthenticatedUser(), subject, text, parentID, groupID);