diff --git a/TSMessages/Classes/TSMessage.m b/TSMessages/Classes/TSMessage.m
index c9395a38..17337376 100755
--- a/TSMessages/Classes/TSMessage.m
+++ b/TSMessages/Classes/TSMessage.m
@@ -195,8 +195,11 @@ - (void)fadeInCurrentNotification
     }
     else
     {
-        toPoint = CGPointMake(currentView.center.x,
-                              currentView.viewController.view.bounds.size.height - CGRectGetHeight(currentView.frame) / 2.0);
+        CGFloat y = currentView.viewController.view.bounds.size.height - CGRectGetHeight(currentView.frame) / 2.0;
+        if (!currentView.viewController.navigationController.isToolbarHidden) {
+            y -= CGRectGetHeight(currentView.viewController.navigationController.toolbar.bounds);
+        }
+        toPoint = CGPointMake(currentView.center.x, y);
     }
 
     dispatch_block_t animationBlock = ^{