Index: orage/src/mainbox.c
===================================================================
--- orage/src/mainbox.c	(revision 255)
+++ orage/src/mainbox.c	(revision 256)
@@ -379,7 +379,7 @@
 #define P_N "add_info_row: "
     GtkWidget *ev, *label;
     CalWin *cal = (CalWin *)g_par.xfcal;
-    gchar *tip, *tmp, *tmp_title, *tmp_note;
+    gchar *tip, *tmp, *tmp_title, *tmp_note, *tmp_location;
     struct tm *t;
     char  *l_time, *s_time, *s_timeonly, *e_time, *c_time, *na, *today;
     gint  len;
@@ -443,25 +443,32 @@
     }
 
     /***** set hint *****/
-    tmp_note = orage_process_text_commands(appt->note);
+    tmp_location=appt->location 
+            ? g_strdup_printf(_("Location: %s\n"), appt->location) 
+            : g_strdup("");
+    tmp_note=appt->note
+            ? g_strdup_printf(_("\nNote:\n%s"), orage_process_text_commands(appt->note))
+            : g_strdup("");
+
     if (todo) {
         na = _("Never");
         e_time = g_strdup(appt->use_due_time
                 ? orage_icaltime_to_i18_time(appt->endtimecur) : na);
         c_time = g_strdup(appt->completed
                 ? orage_icaltime_to_i18_time(appt->completedtime) : na);
-        tip = g_strdup_printf(_("Title: %s\n Location: %s\n Start:\t%s\n Due:\t%s\n Done:\t%s\n Note:\n%s")
-                , tmp_title, appt->location, s_time, e_time, c_time, tmp_note);
+        tip = g_strdup_printf(_("Title: %s\n%sStart:\t%s\nDue:\t%s\nDone:\t%s%s")
+                , tmp_title, tmp_location, s_time, e_time, c_time, tmp_note);
 
         g_free(c_time);
     }
     else { /* it is event */
         e_time = g_strdup(orage_icaltime_to_i18_time(appt->endtimecur));
-        tip = g_strdup_printf(_("Title: %s\n Location: %s\n Start:\t%s\n End:\t%s\n Note:\n%s")
-                , tmp_title, appt->location, s_time, e_time, tmp_note);
+        tip = g_strdup_printf(_("Title: %s\n%sStart:\t%s\nEnd:\t%s%s")
+                , tmp_title, tmp_location, s_time, e_time, tmp_note);
     }
     gtk_tooltips_set_tip(cal->Tooltips, ev, tip, NULL);
     g_free(tmp_title);
+    g_free(tmp_location);
     g_free(tmp_note);
     g_free(s_time);
     g_free(e_time);