diff --git a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
index 10bdec686168..8b1cb8f8aec2 100644
--- a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
+++ b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
@@ -118,4 +118,6 @@ hg4idea.exception.file.not.under.hg=The file {0} is not under Mercurial.
 
 hg4idea.history.copy.revision.number=Copy Revision Number
 
-hg4idea.changelist.column.branch=Branch
\ No newline at end of file
+hg4idea.changelist.column.branch=Branch
+
+hg4idea.annotation.tool.tip=commit {0}\nAuthor: {1}\nDate: {2}\n\n{3}
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java
index 944a70599ee0..86d90be6eb58 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.HgFileRevision;
+import org.zmlx.hg4idea.HgVcsMessages;
 
 import java.util.Date;
 import java.util.LinkedList;
@@ -84,7 +85,25 @@ public class HgAnnotation implements FileAnnotation {
   }
 
   public String getToolTip(int lineNumber) {
-    return null;
+
+    if ( lines.size() <= lineNumber || lineNumber < 0 ) {
+      return "";
+    }
+
+    HgAnnotationLine info = lines.get(lineNumber);
+    if (info == null) {
+      return "";
+    }
+
+    for (HgFileRevision revision : vcsFileRevisions) {
+      if ( revision.getRevisionNumber().equals(info.getVcsRevisionNumber()) ) {
+
+        return HgVcsMessages.message( "hg4idea.annotation.tool.tip", revision.getRevisionNumber().asString(),
+                                      revision.getAuthor(), revision.getRevisionDate(), revision.getCommitMessage() );
+      }
+    }
+
+    return "";
   }
 
   public String getAnnotatedContent() {