diff --git a/static/js/directives/contactsmanager.js b/static/js/directives/contactsmanager.js
index 6f9ef23c..18b26d43 100644
--- a/static/js/directives/contactsmanager.js
+++ b/static/js/directives/contactsmanager.js
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-define(['jquery', 'underscore', 'text!partials/contactsmanagerbutton.html', 'text!partials/contactsmanager.html', 'text!partials/contactsmanageradd.html', 'text!partials/contactsmanageredit.html'], function($, _, templateContactsManagerButton, templateContactsManager, templateContactsManagerAdd, templateContactsManagerEdit) {
+define(['jquery', 'underscore', 'text!partials/contactsmanagerbutton.html', 'text!partials/contactsmanager.html'], function($, _, templateContactsManagerButton, templateContactsManager) {
 
 	return ['contacts', 'alertify', function(contacts, alertify) {
 
@@ -51,24 +51,6 @@ define(['jquery', 'underscore', 'text!partials/contactsmanagerbutton.html', 'tex
 					'controller': modalController
 				});
 			};
-			$scope.contactsManagerAdd = function() {
-				alertify.dialog.buildCustom({
-					'windowClass': windowClass,
-					'header': _('Find new contacts'),
-					'bodydom': templateContactsManagerAdd,
-					'footerdom': null,
-					'controller': modalController
-				});
-			};
-			$scope.contactsManagerEdit = function() {
-				alertify.dialog.buildCustom({
-					'windowClass': windowClass,
-					'header': _('Edit contact'),
-					'bodydom': templateContactsManagerEdit,
-					'footerdom': null,
-					'controller': modalController
-				});
-			};
 		}];
 
 		var link = function($scope, $element) {};
diff --git a/static/partials/contactsmanager.html b/static/partials/contactsmanager.html
index 97c97555..1c36d252 100644
--- a/static/partials/contactsmanager.html
+++ b/static/partials/contactsmanager.html
@@ -1,16 +1,10 @@
 <div class="modal-body">
   <div class="row head">
-    <div class="col-xs-offset-7 col-xs-5">
-      <div class="pull-right">
-      <button class="btn btn-success addbtn">
-        {{_('Find new contacts')}}&nbsp;
-        <i class="fa fa-users"></i>
-        <i class="fa fa-plus"></i>
-      </button>
-      </div>
+     <div class="col-xs-7" ng-if="contacts.length === 0">
+      <h4>{{_('You have no contacts.')}}</h4>
     </div>
   </div>
-  <div class="row">
+  <div class="row" ng-if="contacts.length > 0">
     <div class="col-xs-12 editlist">
       <table class="table table-bordered table-hover table-condensed">
         <tbody>
@@ -22,9 +16,6 @@
             <td class="name">
               <span>{{contact.Status.displayName}}</span>
             </td>
-            <td class="action">
-              <button class="btn btn-primary">{{_('Edit')}}</button>
-            </td>
           </tr>
         </tbody>
       </table>
diff --git a/static/partials/contactsmanageradd.html b/static/partials/contactsmanageradd.html
deleted file mode 100644
index 5c8bd33c..00000000
--- a/static/partials/contactsmanageradd.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="modal-body">
-  <div class="row head">
-    <div class="col-xs-12">
-      <form class="form">
-        <div class="row">
-          <div class="col-xs-7">
-            <span class="search"></span>
-            <input type="text" class="form-control">
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-xs-12 editlist">
-      <table class="table table-bordered table-hover table-condensed">
-        <tbody>
-          <tr ng-repeat"contact in search">
-            <td class="picture">
-              <img ng-show="contact.Status.buddyPicture" ng-src="{{contact.Status.buddyPicture}}">
-              <div ng-show="!contact.Status.buddyPicture" class="buddyPicture"></div>
-            </td>
-            <td class="name">
-              <span>{{contact.Status.displayName}}</span>
-            </td>
-            <td class="action">
-              <button class="btn btn-success">{{_('Add')}}</button>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
-<div class="modal-footer">
-   <div class="row">
-       <div class="col-xs-offset-10 col-xs-2">
-         <button class="btn btn-default" ng-click="ok()">{{_('Done')}}</button>
-       </div>
-    </div>
-</div>
diff --git a/static/partials/contactsmanageredit.html b/static/partials/contactsmanageredit.html
deleted file mode 100644
index a1bc5aae..00000000
--- a/static/partials/contactsmanageredit.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="modal-body">
-  <div class="container-fluid">
-    <div class="row">
-      <form class="form-horizontal">
-        <div class="form-group">
-          <label class="col-xs-4 control-label">{{_('Name')}}</label>
-          <div class="col-xs-6">
-            <input type="text" class="form-control" value="">
-          </div>
-        </div>
-        <div class="form-group">
-          <label class="col-xs-4 control-label">{{_('Picture')}}</label>
-          <div class="col-xs-8">
-            <div class="contactsEditPicture">
-              <div class="userAvatar"></div>
-            </div>
-            <buttton class="btn btn-info uploadbtn">{{_('Upload')}}</buttton>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
-<div class="modal-footer">
-  <div class="row">
-    <div class="col-xs-2">
-      <button class="btn btn-danger">{{_('Remove')}}</button>
-    </div>
-    <div class="col-xs-offset-4 col-xs-6">
-      <div class="pull-right">
-        <button class="btn btn-default" ng-click="cancel()">{{_('Cancel')}}</button> 
-        <button class="btn btn-primary" ng-click="ok()">{{_('Ok')}}</button>
-      </div>
-    </div>
-  </div>
-</div>