diff --git a/Code/Views/ATLMessageComposeTextView.m b/Code/Views/ATLMessageComposeTextView.m
index 4db215967..961699327 100644
--- a/Code/Views/ATLMessageComposeTextView.m
+++ b/Code/Views/ATLMessageComposeTextView.m
@@ -37,8 +37,17 @@ - (id)init
     self = [super init];
     if (self) {
         
-        self.attributedText = [[NSAttributedString alloc] initWithString:@"" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:17],
-                                                                                         NSForegroundColorAttributeName : ATLGrayColor()}];
+        NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
+        paragraphStyle.minimumLineHeight = 30;
+        paragraphStyle.maximumLineHeight = 30;
+        
+        NSDictionary *attributes = @{
+                                     NSFontAttributeName : [UIFont systemFontOfSize:17],
+                                     NSParagraphStyleAttributeName: paragraphStyle,
+                                     NSForegroundColorAttributeName : ATLGrayColor()
+                                     };
+        
+        self.attributedText = [[NSAttributedString alloc] initWithString:@"" attributes: attributes];
         self.textContainerInset = UIEdgeInsetsMake(8, 10, 8, 10);
         self.font = [UIFont systemFontOfSize:17];
         self.dataDetectorTypes = UIDataDetectorTypeLink;