diff --git a/pom.xml b/pom.xml
index fe4a45d7..a39e85ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,11 @@
     		<artifactId>spring-security-ldap</artifactId>
     		<version>${org.springframework-version}</version>
   		</dependency>
+  		<dependency>
+    		<groupId>org.springframework</groupId>
+    		<artifactId>spring-test</artifactId>
+    		<version>${org.springframework-version}</version>
+  		</dependency>
   		
   		<!-- testing LDAP server 
   		<dependency>
diff --git a/src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java b/src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java
new file mode 100644
index 00000000..ec1753a4
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java
@@ -0,0 +1,59 @@
+package info.bukova.isspst.mail;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EntityMessageBuilder implements MessageBuilder {
+	
+	private final static Logger logger = LoggerFactory.getLogger(EntityMessageBuilder.class);
+
+	@Override
+	public MailMessage buildMessage(MailMessage template, Object data) {
+		MailMessage msg = new MailMessage(template);
+		msg.setSubject(replacaProperties(msg.getSubject(), data));
+		msg.setText(replacaProperties(msg.getText(), data));
+		return msg;
+	}
+	
+	private String replacaProperties(String src, Object data) {
+		int current = 0;
+		List<String> properties = new ArrayList<String>();
+		boolean found = false;
+		String ret = src;
+		
+		do {
+			int openIndex = src.indexOf("[", current);
+			int closeIndex = src.indexOf("]", current);
+			if (openIndex != -1) {
+				String property = src.substring(openIndex + 1, closeIndex);
+				if (!properties.contains(property)) {
+					properties.add(property);
+				}
+				found = true;
+			} else {
+				found = false;
+			}
+			current = closeIndex + 1;
+		} while (found);
+		
+		for (String p : properties) {
+			try {
+				ret = ret.replaceAll("\\[" + p + "\\]", BeanUtils.getProperty(data, p));
+			} catch (IllegalAccessException e) {
+				logger.error(e.getMessage());
+			} catch (InvocationTargetException e) {
+				logger.error(e.getMessage());
+			} catch (NoSuchMethodException e) {
+				logger.error(e.getMessage());
+			}
+		}
+		
+		return ret;
+	}
+
+}
diff --git a/src/main/java/info/bukova/isspst/mail/MailMessage.java b/src/main/java/info/bukova/isspst/mail/MailMessage.java
index 43df9fe4..1bb4b7a6 100644
--- a/src/main/java/info/bukova/isspst/mail/MailMessage.java
+++ b/src/main/java/info/bukova/isspst/mail/MailMessage.java
@@ -14,6 +14,18 @@ public class MailMessage extends SimpleMailMessage {
 	private byte[] attachementData;
 	private String contentType;
 
+	public MailMessage() {
+		super();
+	}
+	
+	public MailMessage(MailMessage message) {
+		super(message);
+		this.html = message.isHtml();
+		this.attachementName = message.getAttachementName();
+		this.attachementData = message.getAttachementData();
+		this.contentType = message.getContentType();
+	}
+	
 	public boolean isHtml() {
 		return html;
 	}
diff --git a/src/main/java/info/bukova/isspst/mail/MessageBuilder.java b/src/main/java/info/bukova/isspst/mail/MessageBuilder.java
new file mode 100644
index 00000000..f6d91c6e
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/mail/MessageBuilder.java
@@ -0,0 +1,8 @@
+package info.bukova.isspst.mail;
+
+
+public interface MessageBuilder {
+	
+	MailMessage buildMessage(MailMessage template, Object data);
+
+}
diff --git a/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java b/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
index 6def8eaa..31a39331 100644
--- a/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
+++ b/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
@@ -54,7 +54,7 @@ public class GlobalSettingsVM {
 	@Command
 	@NotifyChange("settings")
 	public void insertField(@BindingParam("field") String field, @BindingParam("message") MailMessage message) {
-		message.setText(message.getText() + ":" + field + ":");
+		message.setText(message.getText() + "[" + field + "]");
 	}
 
 }
diff --git a/src/main/webapp/WEB-INF/spring/mail-services.xml b/src/main/webapp/WEB-INF/spring/mail-services.xml
index 4e58ad9a..a189bb9b 100644
--- a/src/main/webapp/WEB-INF/spring/mail-services.xml
+++ b/src/main/webapp/WEB-INF/spring/mail-services.xml
@@ -27,6 +27,8 @@
 		<property name="from" value="${mail.from}"/>
 	</bean>
 	
+	<bean id="messageBuilder" class="info.bukova.isspst.mail.EntityMessageBuilder"/>
+	
 <!-- 	<bean id="mailer" class="info.bukova.rsfaktura.services.mail.ThreadMailer"> -->
 <!-- 		<constructor-arg ref="attachementMailer"/> -->
 <!-- 	</bean> -->
diff --git a/src/test/java/WEB-INF/jdbc.properties b/src/test/java/WEB-INF/jdbc.properties
new file mode 100644
index 00000000..4e3ec948
--- /dev/null
+++ b/src/test/java/WEB-INF/jdbc.properties
@@ -0,0 +1,5 @@
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.dialect=org.hibernate.dialect.MySQLDialect
+jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst?characterEncoding=latin2&autoReconnect=true
+jdbc.username=isspst
+jdbc.password=xsacfgd
\ No newline at end of file
diff --git a/src/test/java/WEB-INF/ldap.properties b/src/test/java/WEB-INF/ldap.properties
new file mode 100644
index 00000000..4060b43d
--- /dev/null
+++ b/src/test/java/WEB-INF/ldap.properties
@@ -0,0 +1,2 @@
+ldap.server=ldap://localhost:3089
+ldap.userDNPattern=uid=\{0\},OU=people,DC=bukova,DC=info
\ No newline at end of file
diff --git a/src/test/java/WEB-INF/mail.properties b/src/test/java/WEB-INF/mail.properties
new file mode 100644
index 00000000..260c67ee
--- /dev/null
+++ b/src/test/java/WEB-INF/mail.properties
@@ -0,0 +1,7 @@
+mail.from=josef.rokos@gmail.com
+mail.host=smtp.gmail.com
+mail.port=587
+mail.useauth=true
+mail.usessl=true
+mail.username=josef.rokos@gmail.com
+mail.password=XXXXX
\ No newline at end of file
diff --git a/src/test/java/info/bukova/isspst/mail/MessageBuilderTest.java b/src/test/java/info/bukova/isspst/mail/MessageBuilderTest.java
new file mode 100644
index 00000000..62f98d88
--- /dev/null
+++ b/src/test/java/info/bukova/isspst/mail/MessageBuilderTest.java
@@ -0,0 +1,35 @@
+package info.bukova.isspst.mail;
+
+import info.bukova.isspst.data.Material;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:/test-context.xml"})
+public class MessageBuilderTest {
+	
+	@Autowired
+	private MessageBuilder messageBuilder;
+	
+	@Test
+	public void  buildTest() {
+		MailMessage template = new MailMessage();
+		Material data = new Material();
+		data.setCode("pokus");
+		data.setDescription("popisek");
+		
+		template.setSubject("predmet");
+		template.setText("pokusnej text [code] s popiskem [description]");
+		
+		MailMessage replaced = messageBuilder.buildMessage(template, data);
+		
+		assertEquals("pokusnej text pokus s popiskem popisek", replaced.getText());
+	}
+
+}
diff --git a/src/test/resources/test-context.xml b/src/test/resources/test-context.xml
new file mode 100644
index 00000000..aa00b5ff
--- /dev/null
+++ b/src/test/resources/test-context.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+
+	<bean class="org.springframework.mock.web.MockServletContext">
+	
+	</bean>
+	
+	<import resource="file:src/main/webapp/WEB-INF/spring/root-context.xml"/>
+
+</beans>