gerrvim2json.pl | 3 ++-

diff --git a/gerrvim2json.pl b/gerrvim2json.pl
index 79566e047a995759807c8d73896d8278e1956f9e..0119be699b4a4757800c489b08e6cde4050ee2b6 100755
--- a/gerrvim2json.pl
+++ b/gerrvim2json.pl
@@ -68,7 +68,8 @@     if (/^-{5}END-{5}$/) {
         $verbatim_block = 0;
     };
 };
-comment_done;
+comment_done if defined $filename;
+($main_message = buf2str) if !$blockn;
 
 my %result = (comments => \%comments);
 ($result{message} = $main_message) if $main_message;