diff --git a/controllers/emails_controller.php b/controllers/emails_controller.php
index 70714f10..cdaed44b 100755
--- a/controllers/emails_controller.php
+++ b/controllers/emails_controller.php
@@ -8,9 +8,8 @@ class EmailsController extends AppController {
 
 
     var $paginate = array(
-
 	    'fields'=> array('Email.id', 'Email.user_id', 'Email.subject','Email.udate','User.id','User.first_name','User.last_name','User.email'),
-	    'contain' => false,
+	    'contain' => array('User', 'EmailRecipient'),
 	    'limit' => 150,
 	    'order'=>array('Email.id' => 'desc')
 
@@ -106,9 +105,11 @@ class EmailsController extends AppController {
 
 
 
-	    $this->paginate = array(
+	    $this->paginate['Email'] = array(
 		'conditions' => array('Email.id'=>$allIDs),
-		 'order'=>array('Email.udate DESC')
+		'order'=>array('Email.udate DESC'),
+		'contain' => array('EmailRecipient', 'User'),
+		'limit' => 100,
 	    );
 
 
diff --git a/models/email.php b/models/email.php
index fec7ee40..a4780488 100755
--- a/models/email.php
+++ b/models/email.php
@@ -6,6 +6,9 @@ class Email extends AppModel {
 
     var $recursive = 1;
 
+
+    var $actsAs = array('Containable');
+
     var $order = "Email.udate DESC";
 
     var $hasMany = array(
diff --git a/models/email_attachment.php b/models/email_attachment.php
index e03dc9b5..435f9b9c 100755
--- a/models/email_attachment.php
+++ b/models/email_attachment.php
@@ -6,6 +6,8 @@ class EmailAttachment extends AppModel {
 
     var $order = "EmailAttachment.size DESC";
 
+    var $actsAs = array('Containable');
+
 
     var $belongsTo = array(
 	    'Email' => array('className' => 'Email',