diff --git a/elpha-ios/ComposeAccessoryView.xib b/elpha-ios/ComposeAccessoryView.xib
index 2808bcf..d156217 100644
--- a/elpha-ios/ComposeAccessoryView.xib
+++ b/elpha-ios/ComposeAccessoryView.xib
@@ -31,7 +31,7 @@
                     </state>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZKF-NE-Feb">
-                    <rect key="frame" x="52" y="18.5" width="82" height="18"/>
+                    <rect key="frame" x="62" y="18.5" width="82" height="18"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <state key="normal" title=" Visibility" image="Visibility">
                         <color key="titleColor" name="Primary"/>
@@ -48,7 +48,7 @@
             <color key="backgroundColor" name="Secondary"/>
             <constraints>
                 <constraint firstItem="9e6-LL-Q5S" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="20" id="1C4-Zu-jaB"/>
-                <constraint firstItem="ZKF-NE-Feb" firstAttribute="leading" secondItem="9e6-LL-Q5S" secondAttribute="trailing" constant="10" id="7qu-Ze-wUG"/>
+                <constraint firstItem="ZKF-NE-Feb" firstAttribute="leading" secondItem="9e6-LL-Q5S" secondAttribute="trailing" constant="20" id="7qu-Ze-wUG"/>
                 <constraint firstItem="6ye-Mc-D0N" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="B48-lC-JWt"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="6ye-Mc-D0N" secondAttribute="trailing" constant="20" id="SkH-tt-60l"/>
                 <constraint firstItem="9e6-LL-Q5S" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="Ssm-Gb-M63"/>
diff --git a/elpha-ios/ComposeViewController.swift b/elpha-ios/ComposeViewController.swift
index b786afc..b2245ac 100644
--- a/elpha-ios/ComposeViewController.swift
+++ b/elpha-ios/ComposeViewController.swift
@@ -37,7 +37,7 @@ class ComposeViewController: UIViewController {
         
         statusTextView.layer.cornerRadius = 10
         statusTextView.layer.masksToBounds = true
-        statusTextView.textContainerInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+        statusTextView.textContainerInset = UIEdgeInsets(top: 10, left: 5, bottom: 10, right: 5)
         
         replyToAvatarImageView.setRoundedCorners()
         
@@ -83,6 +83,8 @@ class ComposeViewController: UIViewController {
             replyToAvatarImageView.kf.setImage(with: account.avatarURL!, options: options)
             replyToDisplayNameLabel.text = account.displayName
             replyToUsernameLabel.text = "@\(account.acct!)"
+            
+            statusTextView.text = "@\(account.acct!) "
         }
         
         replyToContentTextView.attributedText = status.content?.htmlAttributed(size: 13.0)