diff --git a/source/src/server.cpp b/source/src/server.cpp
index 0586a780..01e2f887 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -583,7 +583,7 @@ void enddemorecord()
     char *timestr = ctime(&t), *trim = timestr + strlen(timestr);
     while(trim>timestr && isspace(*--trim)) *trim = '\0';
     s_sprintf(d.info)("%s: %s, %s, %.2f%s", timestr, modestr(gamemode), smapname, len > 1024*1024 ? len/(1024*1024.f) : len/1024.0f, len > 1024*1024 ? "MB" : "kB");
-    s_sprintfd(msg)("demo \"%s\" recorded", d.info);
+    s_sprintfd(msg)("Demo \"%s\" recorded\nPress F10 to download it from the server..", d.info);
     sendservmsg(msg);
     d.data = new uchar[len];
     d.len = len;
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 56eea83e..bb238bd9 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -740,12 +740,12 @@ struct grenades : weapon
 
     void attackfx(vec &from, vec &to, int millis) // other player's grenades
     {
-        throwmillis = millis;
+        throwmillis = lastmillis-millis;
         if(millis == 0) playsound(S_GRENADEPULL, owner); // activate
         else if(millis > 0) // throw
         {
             inhandnade = new grenadeent(owner, millis);
-            bounceents.add(inhandnade); 
+            bounceents.add(inhandnade);
             thrownade(from, to, inhandnade);
         }
     }
@@ -791,10 +791,9 @@ struct grenades : weapon
 	    p->bouncestate = NADE_THROWED;
         inhandnade = NULL;
 
-        throwmillis = lastmillis;
-
         if(owner==player1)
         {
+            throwmillis = lastmillis;
             playsound(S_GRENADETHROW);
             updatelastaction(player1);
             addmsg(SV_THROWNADE, "ri7", int(p->o.x*DMF), int(p->o.y*DMF), int(p->o.z*DMF), int(p->vel.x*DMF), int(p->vel.y*DMF), int(p->vel.z*DMF), lastmillis-p->millis);