diff --git a/Podfile b/Podfile
index dc97c0ad0..556a820d2 100644
--- a/Podfile
+++ b/Podfile
@@ -5,8 +5,8 @@ target 'Signal' do
     pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
     pod 'AxolotlKit',                 git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
     #pod 'AxolotlKit',                 path: '../SignalProtocolKit'
-    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
-    #pod 'SignalServiceKit',           path: '../SignalServiceKit'
+    #pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'JSQMessagesViewController',  git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'mkirk/retain-keyboard-view'
     #pod 'JSQMessagesViewController',   path: '../JSQMessagesViewController'
     pod 'PureLayout'
diff --git a/Podfile.lock b/Podfile.lock
index 4cecc05ee..086e090f1 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -112,7 +112,7 @@ DEPENDENCIES:
   - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `mkirk/retain-keyboard-view`)
   - PureLayout
   - Reachability
-  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
+  - SignalServiceKit (from `../SignalServiceKit`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
 
 EXTERNAL SOURCES:
@@ -122,7 +122,7 @@ EXTERNAL SOURCES:
     :branch: mkirk/retain-keyboard-view
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :git: https://github.com/WhisperSystems/SignalServiceKit.git
+    :path: ../SignalServiceKit
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
 
@@ -133,9 +133,6 @@ CHECKOUT OPTIONS:
   JSQMessagesViewController:
     :commit: 521686c112bbae7a762f85d52b1e41eeb1760772
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
-  SignalServiceKit:
-    :commit: 4609c508ec51c69af171ea227eca7ac010f065d5
-    :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
     :git: https://github.com/facebook/SocketRocket.git
@@ -161,6 +158,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
 
-PODFILE CHECKSUM: 01734aea935bf91b25ee9aed90e20403075e5d19
+PODFILE CHECKSUM: 2088b6153dfaf0ce79fdf9141c7885c1ab84dd2b
 
 COCOAPODS: 1.2.1
diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index bb460e72b..cfcb01673 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -3592,7 +3592,7 @@ typedef enum : NSUInteger {
 {
     OWSAssert([NSThread isMainThread]);
 
-    DDLogInfo(@"cancelRecordingVoiceMemo");
+    DDLogDebug(@"cancelRecordingVoiceMemo");
 
     [self resetRecordingVoiceMemo];
 }
diff --git a/Signal/src/environment/DebugLogger.m b/Signal/src/environment/DebugLogger.m
index 7eee8e1ea..e4076ca12 100644
--- a/Signal/src/environment/DebugLogger.m
+++ b/Signal/src/environment/DebugLogger.m
@@ -1,9 +1,5 @@
 //
-//  DebugLogger.m
-//  Signal
-//
-//  Created by Frederic Jacobs on 08/08/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugLogger.h"
@@ -30,10 +26,14 @@
 
 
 - (void)enableFileLogging {
-    self.fileLogger = [[DDFileLogger alloc]
-        init]; // Logging to file, because it's in the Cache folder, they are not uploaded in iTunes/iCloud backups.
-    self.fileLogger.rollingFrequency                       = 60 * 60 * 24; // 24 hour rolling.
-    self.fileLogger.logFileManager.maximumNumberOfLogFiles = 3;            // Keep three days of logs.
+    // Logging to file, because it's in the Cache folder, they are not uploaded in iTunes/iCloud backups.
+    self.fileLogger = [DDFileLogger new];
+    // 24 hour rolling.
+    self.fileLogger.rollingFrequency = 60 * 60 * 24;
+    // Keep last 3 days of logs - or last 3 logs (if logs rollover due to max file size).
+    self.fileLogger.logFileManager.maximumNumberOfLogFiles = 3;
+    // Raise the max file size per log file to 3 MB.
+    self.fileLogger.maximumFileSize = 1024 * 1024 * 3;
     self.fileLogger.logFormatter = [OWSScrubbingLogFormatter new];
 
     [DDLog addLogger:self.fileLogger];