2 files changed, 31 insertions, 3 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java b/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java
index a8375dc0..9b627f6b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java
@@ -147,4 +147,33 @@ public class FileUtils {
 	public static boolean isMediaDocument(Uri uri) {
 		return "com.android.providers.media.documents".equals(uri.getAuthority());
 	}
+
+	/**
+	 * @param filename The filename to extract extension from
+	 * @return last extension or empty string
+	 */
+	public static String getLastExtension(final String filename) {
+		if (filename == null || filename.isEmpty()) {
+			return "";
+		}
+		final int lastDotPosition = filename.lastIndexOf('.');
+		final String lastPart = lastDotPosition != -1 ?
+				filename.substring(lastDotPosition + 1) : "";
+		return lastPart;
+	}
+
+	/**
+	 * @param filename The filename to extract extension from
+	 * @return second to last extension or empty string
+	 */
+	public static String getSecondToLastExtension(final String filename) {
+		if (filename == null || filename.isEmpty()) {
+			return "";
+		}
+		final int lastDotPosition = filename.lastIndexOf('.');
+		final int secondToLastDotPosition = filename.lastIndexOf('.', lastDotPosition - 1);
+		final String secondToLastPart = secondToLastDotPosition != -1 ?
+				filename.substring(secondToLastDotPosition + 1, lastDotPosition) : "";
+		return secondToLastPart;
+	}
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
index 44dc4774..e6a5ef7f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
@@ -178,9 +178,8 @@ public class UIHelper {
 				return new Pair<>(getFileDescriptionString(context,message),true);
 			}
 		} else {
-			if (message.getBody().startsWith(Message.ME_COMMAND)) {
-				return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND,
-						UIHelper.getMessageDisplayName(message) + " "), false);
+			if (message.hasMeCommand()) {
+				return new Pair<>(message.getBodyReplacedMeCommand(UIHelper.getMessageDisplayName(message)), false);
 			} else if (GeoHelper.isGeoUri(message.getBody())) {
 				if (message.getStatus() == Message.STATUS_RECEIVED) {
 					return new Pair<>(context.getString(R.string.received_location), true);