diff --git a/Submodules/MessagesTableViewController b/Submodules/MessagesTableViewController
index deb5c73..af7a1be 160000
--- a/Submodules/MessagesTableViewController
+++ b/Submodules/MessagesTableViewController
@@ -1 +1 @@
-Subproject commit deb5c73e2960fd9e626c07caa27b0168a157d3ac
+Subproject commit af7a1be1c9cae2e62d6bb1967267bb4302ed6fa2
diff --git a/Submodules/ProjectTox-Core/ProjectTox-Core b/Submodules/ProjectTox-Core/ProjectTox-Core
index 881b2d9..9c84b54 160000
--- a/Submodules/ProjectTox-Core/ProjectTox-Core
+++ b/Submodules/ProjectTox-Core/ProjectTox-Core
@@ -1 +1 @@
-Subproject commit 881b2d900d1998981fb6b9938ec66012d049635f
+Subproject commit 9c84b5401cdfb621b2e77751ad869b7fea786885
diff --git a/Toxicity/TXCAppDelegate.m b/Toxicity/TXCAppDelegate.m
index 047e6d3..61d811d 100644
--- a/Toxicity/TXCAppDelegate.m
+++ b/Toxicity/TXCAppDelegate.m
@@ -814,7 +814,7 @@ void print_message(Tox *m, int friendnumber, uint8_t * string, uint16_t length,
         NSLog(@"Message from [%d]: %s", friendnumber, string);
         
         TXCMessageObject *theMessage = [[TXCMessageObject alloc] initWithMessage:[NSString stringWithUTF8String:(char *)string]
-                                                                          origin:MessageLocation_Me
+                                                                          origin:MessageLocation_Them
                                                                           family:MessageFamily_Friend
                                                                             type:MessageType_Regular
                                                                       senderName:[[TXCSingleton sharedSingleton] userNick]
diff --git a/Toxicity/en.lproj/MainStoryboard.storyboard b/Toxicity/en.lproj/MainStoryboard.storyboard
index 7eba987..44afbed 100644
--- a/Toxicity/en.lproj/MainStoryboard.storyboard
+++ b/Toxicity/en.lproj/MainStoryboard.storyboard
@@ -300,12 +300,17 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DnX-Uz-f9S">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DnX-Uz-f9S">
                                 <rect key="frame" x="15" y="139" width="290" height="290"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="290" id="8B6-o5-kcK"/>
+                                    <constraint firstAttribute="height" constant="290" id="jXv-qJ-U4R"/>
+                                </constraints>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
+                            <constraint firstAttribute="centerX" secondItem="DnX-Uz-f9S" secondAttribute="centerX" id="H7R-XV-wkB"/>
                             <constraint firstAttribute="centerY" secondItem="DnX-Uz-f9S" secondAttribute="centerY" id="m4y-XD-PlH"/>
                         </constraints>
                     </view>