diff --git a/webui/config.php b/webui/config.php
index 93f522b7..41f8c2f6 100644
--- a/webui/config.php
+++ b/webui/config.php
@@ -58,9 +58,6 @@ $config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'zimbraMailForwardingAddress';
 //$config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'mail';
 
 
-// enable SSO against an Active Directory
-$config['ENABLE_SSO_LOGIN'] = 0;
-
 // enable authentication against an imap server (disabled by default)
 
 $config['ENABLE_IMAP_AUTH'] = 0;
diff --git a/webui/view/theme/default/templates/search/popup.tpl b/webui/view/theme/default/templates/search/popup.tpl
index 607f303f..fd5aca5b 100644
--- a/webui/view/theme/default/templates/search/popup.tpl
+++ b/webui/view/theme/default/templates/search/popup.tpl
@@ -59,13 +59,6 @@
                 </div>
             </div> 
 
-            <div class="control-group">
-                <label class="control-label" for="xis_spam"><?php print $text_spam; ?>:</label>
-                <div class="controls">
-                  <input type="checkbox" name="xis_spam" id="xis_spam" <?php if(isset($is_spam) && $is_spam == 1) { ?>checked="checked"<?php } ?> />
-                </div>
-            </div> 
-            
             <div class="control-group">
                 <label class="control-label" for="date1"><?php print $text_from; ?> <?php print $text_date; ?>:</label>
                 <div class="controls">