diff --git a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailProvider.java b/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailProvider.java
index f0ad4d8..723ef2e 100644
--- a/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailProvider.java
+++ b/forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailProvider.java
@@ -17,6 +17,7 @@ import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -130,6 +131,7 @@ public class FreeMarkerEmailProvider implements EmailProvider {
msg.setSubject(subject);
msg.setText(body);
msg.saveChanges();
+ msg.setSentDate(new Date());
Transport transport = session.getTransport("smtp");
if (auth) {
diff --git a/testsuite/tools/src/main/webapp/pages/mail.html b/testsuite/tools/src/main/webapp/pages/mail.html
index b378019..400c63a 100644
--- a/testsuite/tools/src/main/webapp/pages/mail.html
+++ b/testsuite/tools/src/main/webapp/pages/mail.html
@@ -7,17 +7,18 @@
<table class="table table-striped table-bordered">
<thead>
<tr>
- <th>From</th>
+ <th>Date</th>
<th>To</th>
+ <th>From</th>
<th>Subject</th>
<th>Body</th>
</tr>
</thead>
<tr data-ng-repeat="m in messages|reverse">
- <td>{{m.from}}</td>
+ <td>{{m.date|date:'medium'}}</td>
<td>{{m.to}}</td>
+ <td>{{m.from}}</td>
<td>{{m.subject}}</td>
<td><pre>{{m.body}}</pre></td>
- <td>{{m.date|date:'medium'}}</td>
</tr>
</table>
\ No newline at end of file
