diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 614a3b487..bfc1a261d 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -341,7 +341,6 @@
 		B63761ED19E1FBE8005735D1 /* HttpRequestOrResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B63761E719E1FBE8005735D1 /* HttpRequestOrResponse.m */; };
 		B63761EE19E1FBE8005735D1 /* HttpRequestUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B63761E919E1FBE8005735D1 /* HttpRequestUtil.m */; };
 		B63761EF19E1FBE8005735D1 /* HttpResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B63761EB19E1FBE8005735D1 /* HttpResponse.m */; };
-		B63885CD1A26772D00A226A6 /* TSMessagesManager+callRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = B63885CC1A26772D00A226A6 /* TSMessagesManager+callRecorder.m */; };
 		B63885D01A2685D700A226A6 /* PreKeyBundle+jsonDict.m in Sources */ = {isa = PBXBuildFile; fileRef = B63885CF1A2685D700A226A6 /* PreKeyBundle+jsonDict.m */; };
 		B63AF5C71A1F757900D01AAD /* TSContactsIntersectionRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5AD1A1F757900D01AAD /* TSContactsIntersectionRequest.m */; };
 		B63AF5C81A1F757900D01AAD /* TSUnregisterAccountRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63AF5AF1A1F757900D01AAD /* TSUnregisterAccountRequest.m */; };
@@ -960,8 +959,6 @@
 		B63761E919E1FBE8005735D1 /* HttpRequestUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpRequestUtil.m; sourceTree = "<group>"; };
 		B63761EA19E1FBE8005735D1 /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpResponse.h; sourceTree = "<group>"; };
 		B63761EB19E1FBE8005735D1 /* HttpResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpResponse.m; sourceTree = "<group>"; };
-		B63885CB1A26772D00A226A6 /* TSMessagesManager+callRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TSMessagesManager+callRecorder.h"; sourceTree = "<group>"; };
-		B63885CC1A26772D00A226A6 /* TSMessagesManager+callRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TSMessagesManager+callRecorder.m"; sourceTree = "<group>"; };
 		B63885CE1A2685D700A226A6 /* PreKeyBundle+jsonDict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PreKeyBundle+jsonDict.h"; sourceTree = "<group>"; };
 		B63885CF1A2685D700A226A6 /* PreKeyBundle+jsonDict.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PreKeyBundle+jsonDict.m"; sourceTree = "<group>"; };
 		B63AF5AC1A1F757900D01AAD /* TSContactsIntersectionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSContactsIntersectionRequest.h; sourceTree = "<group>"; };
@@ -2401,8 +2398,6 @@
 				B6B096121A1D25ED008BFAA6 /* TSMessage.m */,
 				B6B50AA91A4192C500F8F607 /* TSMessagesManager+attachments.h */,
 				B6B50AAA1A4192C500F8F607 /* TSMessagesManager+attachments.m */,
-				B63885CB1A26772D00A226A6 /* TSMessagesManager+callRecorder.h */,
-				B63885CC1A26772D00A226A6 /* TSMessagesManager+callRecorder.m */,
 				B6B096131A1D25ED008BFAA6 /* TSMessagesManager+sendMessages.h */,
 				B6B096141A1D25ED008BFAA6 /* TSMessagesManager+sendMessages.m */,
 				B6B096151A1D25ED008BFAA6 /* TSMessagesManager.h */,
@@ -3341,7 +3336,6 @@
 				B6B096761A1D25ED008BFAA6 /* TSServerMessage.m in Sources */,
 				B63761E319E1F487005735D1 /* AFHTTPSessionManager+SignalMethods.m in Sources */,
 				76EB05CC18170B33006006FC /* ShortAuthenticationStringGenerator.m in Sources */,
-				B63885CD1A26772D00A226A6 /* TSMessagesManager+callRecorder.m in Sources */,
 				E16E5BEF18AAC40200B7C403 /* EC25KeyAgreementProtocol.m in Sources */,
 				B6B096901A1D25ED008BFAA6 /* Cryptography.m in Sources */,
 				76EB064018170B33006006FC /* AnonymousTerminator.m in Sources */,
@@ -3749,7 +3743,7 @@
 				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_NAME = Signal;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "0905ca6e-ed58-486b-8af7-5d20168a2d59";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_AFTER_BUILD = YES;
@@ -3803,7 +3797,7 @@
 				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_NAME = Signal;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "0905ca6e-ed58-486b-8af7-5d20168a2d59";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_AFTER_BUILD = YES;
diff --git a/Signal/src/contact/ContactsManager.h b/Signal/src/contact/ContactsManager.h
index 9443a4b34..a5bd11e57 100644
--- a/Signal/src/contact/ContactsManager.h
+++ b/Signal/src/contact/ContactsManager.h
@@ -42,6 +42,7 @@ typedef void(^ABReloadRequestCompletionBlock)(NSArray *contacts);
 +(BOOL)phoneNumber:(PhoneNumber *)phoneNumber matchesQuery:(NSString *)queryString;
 
 - (NSArray*)allContacts;
+- (NSArray*)signalContacts;
 - (NSArray*)textSecureContacts;
 
 - (BOOL)isContactRegisteredWithRedPhone:(Contact*)contact;
diff --git a/Signal/src/contact/ContactsManager.m b/Signal/src/contact/ContactsManager.m
index 25f83e2db..62547a905 100644
--- a/Signal/src/contact/ContactsManager.m
+++ b/Signal/src/contact/ContactsManager.m
@@ -386,6 +386,10 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
     }];
 }
 
+-(NSArray*) signalContacts {
+    return [self getSignalUsersFromContactsArray:self.allContacts];
+}
+
 -(NSArray*) textSecureContacts {
     return [[self.allContacts filter:^int(Contact* contact) {
         return [contact isTextSecureContact];
diff --git a/Signal/src/textsecure/Messages/TSMessagesManager+callRecorder.h b/Signal/src/textsecure/Messages/TSMessagesManager+callRecorder.h
deleted file mode 100644
index 9e8712984..000000000
--- a/Signal/src/textsecure/Messages/TSMessagesManager+callRecorder.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  TSMessagesManager+callRecorder.h
-//  Signal
-//
-//  Created by Frederic Jacobs on 26/11/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
-//
-
-#import "TSMessagesManager.h"
-#import "TSCall.h"
-
-@interface TSMessagesManager (callRecorder)
-
-- (void)storePhoneCall:(TSCall*)call;
-
-@end
diff --git a/Signal/src/textsecure/Messages/TSMessagesManager+callRecorder.m b/Signal/src/textsecure/Messages/TSMessagesManager+callRecorder.m
deleted file mode 100644
index 7308b2df8..000000000
--- a/Signal/src/textsecure/Messages/TSMessagesManager+callRecorder.m
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  TSMessagesManager+callRecorder.m
-//  Signal
-//
-//  Created by Frederic Jacobs on 26/11/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
-//
-
-#import "TSMessagesManager+callRecorder.h"
-#import <YapDatabase/YapDatabaseConnection.h>
-
-#import "Environment.h"
-#import "ContactsManager.h"
-
-@implementation TSMessagesManager (callRecorder)
-
-- (void)storePhoneCall:(TSCall*)call{
-    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        [call saveWithTransaction:transaction];
-    }];
-}
-
-
-@end
diff --git a/Signal/src/view controllers/MessageComposeTableViewController.m b/Signal/src/view controllers/MessageComposeTableViewController.m
index ab64aa969..500135a06 100644
--- a/Signal/src/view controllers/MessageComposeTableViewController.m	
+++ b/Signal/src/view controllers/MessageComposeTableViewController.m	
@@ -45,7 +45,7 @@
     [super viewDidLoad];
     [self.navigationController.navigationBar setTranslucent:NO];    
     
-    contacts = [[Environment getCurrent] contactsManager].textSecureContacts;
+    contacts = [[Environment getCurrent] contactsManager].signalContacts;
     searchResults = contacts;
     [self initializeSearch];
 
@@ -447,6 +447,7 @@
 }
 
 - (void)contactsDidRefresh {
+    contacts = [[Environment getCurrent] contactsManager].signalContacts;
     [self updateSearchResultsForSearchController:self.searchController];
     [self.tableView reloadData];
     [self updateAfterRefreshTry];