diff -r a788bf0e1080 -r c81406884e16 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	Tue Oct 25 15:06:59 2011 +0200
@@ -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);