diff --git a/application/views/options/email.php b/application/views/options/email.php
index 9a11bd6a..48ae318c 100644
--- a/application/views/options/email.php
+++ b/application/views/options/email.php
@@ -20,18 +20,25 @@
 
                     <?php if($this->session->flashdata('message')) { ?>
                         <!-- Display Message -->
-                        <div class="alert-message error">
+                        <div class="alert alert-info">
                         <?php echo $this->session->flashdata('message'); ?>
                         </div>
                     <?php } ?>
 
+                    <?php if($this->session->flashdata('error')) { ?>
+                        <!-- Display Message -->
+                        <div class="alert alert-danger">
+                        <?php echo $this->session->flashdata('error'); ?>
+                        </div>
+                    <?php } ?>
+
                     <?php if(validation_errors()) { ?>
                     <div class="alert alert-danger">
                         <a class="close" data-dismiss="alert">x</a>
                         <?php echo validation_errors(); ?>
                     </div>
                     <?php } ?>
-
+                        
                     <?php echo form_open('options/email_save'); ?>
 
                         <div class="form-group">
@@ -109,6 +116,7 @@
 
                         <!-- Save the Form -->
                         <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
+                        <button class="btn btn-secondary" id="sendTestMailButton"><?php echo lang('options_send_testmail'); ?></button>
                     </form>
                 </div>
             </div>