diff --git a/Podfile.lock b/Podfile.lock
index af8dda1fe..153b82414 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -125,7 +125,7 @@ EXTERNAL SOURCES:
     :branch: signal-master
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :path: "."
+    :path: .
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
 
diff --git a/SignalServiceKit/src/Messages/TSMessagesManager.m b/SignalServiceKit/src/Messages/TSMessagesManager.m
index 745d69021..d7fc2819d 100644
--- a/SignalServiceKit/src/Messages/TSMessagesManager.m
+++ b/SignalServiceKit/src/Messages/TSMessagesManager.m
@@ -408,7 +408,7 @@ NS_ASSUME_NONNULL_BEGIN
             if (encryptedData.length > kMaxEncryptedDataLength) {
                 OWSProdErrorWParams(@"message_manager_error_oversize_message", ^{
                     return (@{
-                        @"message_size" : @(encryptedData.length),
+                        @"message_size" : @([OWSAnalytics orderOfMagnitudeOf:(long)encryptedData.length]),
                     });
                 });
                 completion(nil);
diff --git a/SignalServiceKit/src/Util/OWSAnalytics.h b/SignalServiceKit/src/Util/OWSAnalytics.h
index b3abfa4df..10714eeaa 100755
--- a/SignalServiceKit/src/Util/OWSAnalytics.h
+++ b/SignalServiceKit/src/Util/OWSAnalytics.h
@@ -48,6 +48,8 @@ typedef NS_ENUM(NSUInteger, OWSAnalyticsSeverity) {
 
 + (void)appLaunchDidComplete;
 
++ (long)orderOfMagnitudeOf:(long)value;
+
 @end
 
 typedef NSDictionary<NSString *, id> *_Nonnull (^OWSProdAssertParametersBlock)();
diff --git a/SignalServiceKit/tests/Util/OWSAnalyticsTests.m b/SignalServiceKit/tests/Util/OWSAnalyticsTests.m
index 8a13136e1..c4201fa01 100644
--- a/SignalServiceKit/tests/Util/OWSAnalyticsTests.m
+++ b/SignalServiceKit/tests/Util/OWSAnalyticsTests.m
@@ -12,11 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface OWSAnalytics (Test)
-
-+ (long)orderOfMagnitudeOf:(long)value;
-
-@end
+#pragma mark -
 
 @implementation OWSAnalyticsTests