diff --git a/JSMessagesTableViewController/JSMessagesViewController.m b/JSMessagesTableViewController/JSMessagesViewController.m
index 38fe20c..10c1a43 100644
--- a/JSMessagesTableViewController/JSMessagesViewController.m
+++ b/JSMessagesTableViewController/JSMessagesViewController.m
@@ -57,7 +57,7 @@
         // fix for ipad modal form presentations
         ((UIScrollView *)self.view).scrollEnabled = NO;
     }
-  
+    
     CGSize size = self.view.frame.size;
 	
     CGRect tableFrame = CGRectMake(0.0f, 0.0f, size.width, size.height - INPUT_HEIGHT);
@@ -215,7 +215,11 @@
             return indexPath.row % 5 == 0;
             break;
         case JSMessagesViewTimestampPolicyCustom:
-            return NO;
+            if ([self.delegate hasTimestampForRowAtIndexPath:indexPath]) {
+                return [self.delegate hasTimestampForRowAtIndexPath:indexPath];
+            } else {
+                return NO;
+            }
             break;
     }
     
@@ -282,9 +286,9 @@
                              UIEdgeInsets insets = UIEdgeInsetsMake(0.0f, 0.0f, self.tableView.contentInset.bottom + changeInHeight, 0.0f);
                              self.tableView.contentInset = insets;
                              self.tableView.scrollIndicatorInsets = insets;
-                            
+                             
                              [self scrollToBottomAnimated:NO];
-                            
+                             
                              CGRect inputViewFrame = self.inputView.frame;
                              self.inputView.frame = CGRectMake(0.0f,
                                                                inputViewFrame.origin.y - changeInHeight,
@@ -332,7 +336,7 @@
                          CGFloat messageViewFrameBottom = self.view.frame.size.height - INPUT_HEIGHT;
                          if(inputViewFrameY > messageViewFrameBottom)
                              inputViewFrameY = messageViewFrameBottom;
-
+                         
                          self.inputView.frame = CGRectMake(inputViewFrame.origin.x,
                                                            inputViewFrameY,
                                                            inputViewFrame.size.width,