diff --git a/Pod/Classes/TSMessageView.m b/Pod/Classes/TSMessageView.m
index 9214f0bc..4def8239 100755
--- a/Pod/Classes/TSMessageView.m
+++ b/Pod/Classes/TSMessageView.m
@@ -343,10 +343,12 @@ - (id)initWithTitle:(NSString *)title
                                       UISwipeGestureRecognizerDirectionUp :
                                       UISwipeGestureRecognizerDirectionDown)];
             [self addGestureRecognizer:gestureRec];
-            
-            UITapGestureRecognizer *tapRec = [[UITapGestureRecognizer alloc] initWithTarget:self
-                                                                                     action:@selector(fadeMeOut)];
-            [self addGestureRecognizer:tapRec];
+          
+            if (! self.callback) {
+                UITapGestureRecognizer *tapRec = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                                         action:@selector(fadeMeOut)];
+                [self addGestureRecognizer:tapRec];
+            }
         }
         
         if (self.callback) {
@@ -507,6 +509,7 @@ - (void)handleTap:(UITapGestureRecognizer *)tapGesture
             self.callback();
         }
     }
+    [self fadeMeOut];
 }
 
 #pragma mark - UIGestureRecognizerDelegate