1 files changed, 3 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/notification/TextTemplateFormatter.java b/src/main/java/org/traccar/notification/TextTemplateFormatter.java
index 77a2fea05..6a95628f0 100644
--- a/src/main/java/org/traccar/notification/TextTemplateFormatter.java
+++ b/src/main/java/org/traccar/notification/TextTemplateFormatter.java
@@ -71,17 +71,11 @@ public final class TextTemplateFormatter {
         return template;
     }
 
-    public static Message formatMessage(VelocityContext velocityContext, String name, String templatePath) {
-        String formattedMessage = format(velocityContext, name, templatePath);
-        return new Message((String) velocityContext.get("subject"), formattedMessage);
-    }
-
-    private static String format(
-            VelocityContext velocityContext, String name, String templatePath) {
-
+    public static NotificationMessage formatMessage(VelocityContext velocityContext, String name, String templatePath) {
         StringWriter writer = new StringWriter();
         getTemplate(name, templatePath).merge(velocityContext, writer);
-        return writer.toString();
+        String formattedMessage = writer.toString();
+        return new NotificationMessage((String) velocityContext.get("subject"), formattedMessage);
     }
 
 }