diff --git a/felamimail/inc/class.ajax_contacts.inc.php b/felamimail/inc/class.ajax_contacts.inc.php
index f8b74b390a..d446502718 100644
--- a/felamimail/inc/class.ajax_contacts.inc.php
+++ b/felamimail/inc/class.ajax_contacts.inc.php
@@ -28,7 +28,7 @@
 						'n_fn'       => $_searchString,
 						'email'      => $_searchString,
 						'email_home' => $_searchString,
-					),array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,20));
+					),array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100));
 
 					// additionally search the accounts, if the contact storage is not the account storage
 					if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
@@ -38,7 +38,7 @@
 							'n_fn'       => $_searchString,
 							'email'      => $_searchString,
 							'email_home' => $_searchString,
-						),array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,20),array('owner' => 0));
+						),array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),array('owner' => 0));
 						
 						if ($contacts && $accounts)
 						{
diff --git a/felamimail/js/jscode/composeMessage.js b/felamimail/js/jscode/composeMessage.js
index 803d4539ea..aa515a094f 100644
--- a/felamimail/js/jscode/composeMessage.js
+++ b/felamimail/js/jscode/composeMessage.js
@@ -272,6 +272,7 @@ function displayResultBox() {
 		resultBox.style.top=top + 'px';
 		resultBox.style.left=left + 'px';
 		resultBox.style.width=width + 'px';
+		resultBox.scrollTop=0;
 
 		resultBox.className = 'resultBoxVisible';
 	}
diff --git a/felamimail/templates/default/app.css b/felamimail/templates/default/app.css
index 15399eed89..86d5bc63d3 100644
--- a/felamimail/templates/default/app.css
+++ b/felamimail/templates/default/app.css
@@ -382,6 +382,8 @@ div.resultBoxVisible {
 	position: absolute; 
 	display: block; 
 	background: white;
+	max-height: 25%;
+	overflow: auto;
 }
 
 button.menuButton {
diff --git a/felamimail/templates/jerryr/app.css b/felamimail/templates/jerryr/app.css
index 187eb337c8..2c0be99bc0 100644
--- a/felamimail/templates/jerryr/app.css
+++ b/felamimail/templates/jerryr/app.css
@@ -409,6 +409,8 @@ div.resultBoxVisible {
 	position: absolute; 
 	display: block; 
 	background: white;
+	max-height: 25%;
+	overflow: auto;
 }
 
 button.menuButton {