diff --git a/spring-mvc-email/src/main/java/com/baeldung/spring/controllers/MailController.java b/spring-mvc-email/src/main/java/com/baeldung/spring/controllers/MailController.java
index 832a60ba5d..1f536e3297 100644
--- a/spring-mvc-email/src/main/java/com/baeldung/spring/controllers/MailController.java
+++ b/spring-mvc-email/src/main/java/com/baeldung/spring/controllers/MailController.java
@@ -31,7 +31,7 @@ public class MailController {
     @Qualifier("templateSimpleMessage")
     public SimpleMailMessage template;
 
-    @RequestMapping(value = "/send", method = RequestMethod.GET)
+    @RequestMapping(value = {"/send", "/sendTemplate", "/sendAttachment"}, method = RequestMethod.GET)
     public String createMail(Model model) {
         model.addAttribute("mailObject", new MailObject());
         return "mail/send";
diff --git a/spring-mvc-email/src/main/webapp/WEB-INF/views/home.jsp b/spring-mvc-email/src/main/webapp/WEB-INF/views/home.jsp
index 74165f2626..63351bbf3a 100644
--- a/spring-mvc-email/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-mvc-email/src/main/webapp/WEB-INF/views/home.jsp
@@ -15,9 +15,27 @@
 <body>
     <div>
         <div>
-            <h4>Send Email</h4>
-            <form action="mail/send" method="get">
-                <input type="submit" value="Send Email">
+            <h4>Select any of the options below to send sample email:</h4>
+            <form method="get" style="width: 200px;">
+                <fieldset style="border: none; padding-left: 0px; padding-top: 0px">
+                    <table>
+                        <tr>
+                            <td>
+                                <input type="submit" formaction="mail/send" value="Send Simple Email">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="submit" formaction="mail/sendTemplate" value="Send Email Using Template">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="submit" formaction="mail/sendAttachment" value="Send Email With Attachment">
+                            </td>
+                        </tr>
+                    </table>
+                </fieldset>
             </form>
         </div>
     </div>
diff --git a/spring-mvc-email/src/main/webapp/WEB-INF/views/mail/send.jsp b/spring-mvc-email/src/main/webapp/WEB-INF/views/mail/send.jsp
index 1307fc2baf..294cb2c49c 100644
--- a/spring-mvc-email/src/main/webapp/WEB-INF/views/mail/send.jsp
+++ b/spring-mvc-email/src/main/webapp/WEB-INF/views/mail/send.jsp
@@ -43,9 +43,7 @@
                     <tr>
                         <th></th>
                         <td>
-                            <input type="submit" formaction="send" value="Send">
-                            <input type="submit" formaction="sendTemplate" value="Send Using Template">
-                            <input type="submit" formaction="sendAttachment" value="Send With Attachment">
+                            <input type="submit" value="Send">
                         </td>
                     </tr>
                 </table>
