diff --git a/app/models/contact/Contact.php b/app/models/contact/Contact.php
index 513f32d21..6aff30bf0 100644
--- a/app/models/contact/Contact.php
+++ b/app/models/contact/Contact.php
@@ -168,8 +168,10 @@ class Contact extends ModlModel {
     }
 
     public function createThumbnails() {
-        \createThumbnails(strtolower($this->jid), $this->photobin);
-        \createEmailPic(strtolower($this->jid), $this->email);
+        if(isset($this->photobin))
+            \createThumbnails(strtolower($this->jid), $this->photobin);
+        if(isset($this->email))
+            \createEmailPic(strtolower($this->jid), $this->email);
     }
 
     public function getPhoto($size = 'l', $jid = false) {
diff --git a/app/widgets/Chat/Chat.php b/app/widgets/Chat/Chat.php
index 01b10d49f..156090c34 100644
--- a/app/widgets/Chat/Chat.php
+++ b/app/widgets/Chat/Chat.php
@@ -111,12 +111,12 @@ class Chat extends WidgetBase
                            'messages'.$contact->jid,
                            $html);
             
-            if($message->session != $message->jidfrom) {
+            //if($message->session != $message->jidfrom) {
                 RPC::call('hideComposing',
                            $contact->jid); 
                 RPC::call('hidePaused',
                            $contact->jid);
-            }
+            //}
                            
             RPC::call('scrollTalk',
                            'messages'.$contact->jid);
diff --git a/app/widgets/ContactCard/ContactCard.php b/app/widgets/ContactCard/ContactCard.php
index 43ccbe073..02120f5fc 100644
--- a/app/widgets/ContactCard/ContactCard.php
+++ b/app/widgets/ContactCard/ContactCard.php
@@ -58,10 +58,7 @@ class ContactCard extends WidgetCommon
                         <span>'.$contact->name.'</span>
                       </div>';
 
-            if(
-                $contact->date != '0000-00-00T00:00:00+0000' 
-                && $contact->date != '1970-01-01T00:00:00+0000'
-                && $this->testIsSet($contact->date))
+            if($this->testIsSet($contact->date))
             $html .= '<div class="element simple">
                         <label for="day">'.t('Date of Birth').'</label>
                         <span>'.date('j M Y',strtotime($contact->date)).'</span>
@@ -79,7 +76,6 @@ class ContactCard extends WidgetCommon
                         <span>'.$marital[$contact->marital].'</span>
                       </div>';
 
-            //  <a target="_blank" href="mailto:'.$contact->email.'">'.$contact->email.'</a>
             if($this->testIsSet($contact->email)) {
                 if(filter_var($contact->email, FILTER_VALIDATE_EMAIL)) {
                     $html .= '<div class="element simple">