diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html
--- a/rhodecode/templates/admin/settings/settings.html
+++ b/rhodecode/templates/admin/settings/settings.html
@@ -17,15 +17,15 @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}       
+        ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
-    
+
     <h3>${_('Remap and rescan repositories')}</h3>
     ${h.form(url('admin_setting', setting_id='mapping'),method='put')}
     <div class="form">
         <!-- fields -->
-        
+
         <div class="fields">
 			<div class="field">
 		        <div class="label label-checkbox">
@@ -40,19 +40,19 @@
 		            </div>
 		        </div>
 			</div>
-                            
+
             <div class="buttons">
             ${h.submit('rescan',_('Rescan repositories'),class_="ui-button")}
-            </div>                                                          
+            </div>
         </div>
-    </div>  
+    </div>
     ${h.end_form()}
-    
+
     <h3>${_('Whoosh indexing')}</h3>
     ${h.form(url('admin_setting', setting_id='whoosh'),method='put')}
     <div class="form">
         <!-- fields -->
-        
+
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
@@ -65,21 +65,21 @@
                     </div>
                 </div>
             </div>
-                            
+
             <div class="buttons">
             ${h.submit('reindex',_('Reindex'),class_="ui-button")}
-            </div>                                                          
+            </div>
         </div>
-    </div>  
+    </div>
     ${h.end_form()}
-         
-    <h3>${_('Global application settings')}</h3> 
+
+    <h3>${_('Global application settings')}</h3>
     ${h.form(url('admin_setting', setting_id='global'),method='put')}
     <div class="form">
         <!-- fields -->
-        
+
         <div class="fields">
-             
+
              <div class="field">
                 <div class="label">
                     <label for="rhodecode_title">${_('Application name')}:</label>
@@ -88,7 +88,7 @@
                     ${h.text('rhodecode_title',size=30)}
                 </div>
              </div>
-                          
+
             <div class="field">
                 <div class="label">
                     <label for="rhodecode_realm">${_('Realm text')}:</label>
@@ -97,7 +97,7 @@
                     ${h.text('rhodecode_realm',size=30)}
                 </div>
             </div>
-            
+
             <div class="field">
                 <div class="label">
                     <label for="rhodecode_ga_code">${_('GA code')}:</label>
@@ -106,22 +106,22 @@
                     ${h.text('rhodecode_ga_code',size=30)}
                 </div>
             </div>
-                                                 
+
             <div class="buttons">
                 ${h.submit('save',_('Save settings'),class_="ui-button")}
                 ${h.reset('reset',_('Reset'),class_="ui-button")}
-           </div>                                                          
+           </div>
         </div>
-    </div>      
+    </div>
     ${h.end_form()}
 
-    <h3>${_('Mercurial settings')}</h3> 
+    <h3>${_('Mercurial settings')}</h3>
     ${h.form(url('admin_setting', setting_id='mercurial'),method='put')}
     <div class="form">
         <!-- fields -->
-        
+
         <div class="fields">
-             
+
              <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Web')}:</label>
@@ -132,15 +132,12 @@
 						<label for="web_push_ssl">${_('require ssl for pushing')}</label>
 					</div>
 				</div>
-             </div>						
+             </div>
 
              <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Hooks')}:</label>
                 </div>
-                <div class="input">
-                    ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'))}
-                </div>                
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_update','True')}
@@ -157,30 +154,32 @@
                     <div class="checkbox">
                         ${h.checkbox('hooks_preoutgoing_pull_logger','True')}
                         <label for="hooks_preoutgoing_pull_logger">${_('Log user pull commands')}</label>
-                    </div>                    										
+                    </div>
 				</div>
-             </div>	
-							                          
+                <div class="input" style="margin-top:10px">
+                    ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-btn")}
+                </div>
+             </div>
             <div class="field">
                 <div class="label">
                     <label for="paths_root_path">${_('Repositories location')}:</label>
                 </div>
                 <div class="input">
-                    ${h.text('paths_root_path',size=30,readonly="readonly")}			                    
-					<span id="path_unlock" class="tooltip" 
+                    ${h.text('paths_root_path',size=30,readonly="readonly")}
+					<span id="path_unlock" class="tooltip"
 						title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}">
 		                ${_('unlock')}</span>
                 </div>
             </div>
-                                     
+
             <div class="buttons">
                 ${h.submit('save',_('Save settings'),class_="ui-button")}
                 ${h.reset('reset',_('Reset'),class_="ui-button")}
-           </div>                                                          
+           </div>
         </div>
-    </div>      
+    </div>
     ${h.end_form()}
-    
+
     <script type="text/javascript">
         YAHOO.util.Event.onDOMReady(function(){
             YAHOO.util.Event.addListener('path_unlock','click',function(){
@@ -188,5 +187,28 @@
             });
         });
     </script>
+
+    <h3>${_('Test Email')}</h3>
+    ${h.form(url('admin_setting', setting_id='email'),method='put')}
+    <div class="form">
+        <!-- fields -->
+
+        <div class="fields">
+            <div class="field">
+                <div class="label">
+                    <label for="test_email">${_('Email to')}:</label>
+                </div>
+                <div class="input">
+                    ${h.text('test_email',size=30)}
+                </div>
+            </div>
+
+            <div class="buttons">
+            ${h.submit('send',_('Send'),class_="ui-button")}
+            </div>
+        </div>
+    </div>
+    ${h.end_form()}
+
 </div>
-</%def>    
+</%def>