diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 384e87d1e..50ad7f38c 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -68,7 +68,7 @@ public abstract class AbstractParser {
 		timestamp = timestamp.replace("Z", "+0000");
 		SimpleDateFormat dateFormat;
 		long ms;
-		if (timestamp.charAt(19) == '.' && timestamp.length() >= 25) {
+		if (timestamp.length() >= 25 && timestamp.charAt(19) == '.') {
 			String millis = timestamp.substring(19,timestamp.length() - 5);
 			try {
 				double fractions = Double.parseDouble("0" + millis);