diff --git a/doc/ChangeLog b/doc/ChangeLog
index e0ef6cbd..a4ce0045 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,20 @@
+Version 2.7.8, released December 2nd 2009
+=========================================
+
+- Implemented "Sort attributes = Date"
+- Implemented "Allow branching"
+- Implemented "Preset on first reply"
+- Avoid double substitutions on 'preset on reply'
+- Fixed paper clip display in replies
+- Removed "Pragma: no-cache" from export.* (IE SSL problem)
+- Do not execute 'Subst <attrib>' on replies
+- Execute 'subst on edit' and 'subst on reply' AFTER submission
+- Added 'summary line length'
+- Added check for full file system in order not to corrupt the password file
+- Implemented "sort attribute options"
+- Fixed problem with init_resize and plain text with restricted message height, thanks to Richard S
+- Avoid sending empty header after synchronizing
+
 Version 2.7.7, released July 31st 2009
 ======================================
 
diff --git a/elog.nsi b/elog.nsi
index 4850810c..0d425d40 100755
--- a/elog.nsi
+++ b/elog.nsi
@@ -159,7 +159,7 @@ Section "Start Menu Shortcuts" SecStart
   Delete "$SMPROGRAMS\ELOG\Demo Logbook (requires running server).lnk"
   WriteINIStr "$SMPROGRAMS\ELOG\Demo Logbook (requires running server).url" \
               "InternetShortcut" "URL" "http://localhost:8080/demo/"
-  CreateShortCut "$SMPROGRAMS\ELOG\ELOG Documentation.lnk" "$INSTDIR\doc\index_d.html"
+  CreateShortCut "$SMPROGRAMS\ELOG\ELOG Documentation.lnk" "$INSTDIR\doc\index.html"
   CreateShortCut "$SMPROGRAMS\ELOG\Uninstall ELOG.lnk" "$INSTDIR\uninst_elog.exe" "" "$INSTDIR\uninst_elog.exe" 0
 SectionEnd
 
@@ -175,7 +175,7 @@ Function .onInstSuccess
   MessageBox MB_YESNO|MB_ICONQUESTION \
              "Setup has completed. View readme file now?" \
              IDNO NoReadme
-    ExecShell open '$INSTDIR\doc\index_d.html'
+    ExecShell open '$INSTDIR\doc\index.html'
   NoReadme:
 FunctionEnd
 
diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian
index b50c68c2..ed517189 100755
--- a/resources/eloglang.brazilian
+++ b/resources/eloglang.brazilian
@@ -471,3 +471,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian
index 9880c27c..beae0f45 100755
--- a/resources/eloglang.bulgarian
+++ b/resources/eloglang.bulgarian
@@ -471,3 +471,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.czech b/resources/eloglang.czech
index bf03dd3b..6f53150f 100644
--- a/resources/eloglang.czech
+++ b/resources/eloglang.czech
@@ -468,3 +468,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.danish b/resources/eloglang.danish
index b5e0fad8..4d38d810 100755
--- a/resources/eloglang.danish
+++ b/resources/eloglang.danish
@@ -468,3 +468,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch
index bcf277b4..534c6059 100755
--- a/resources/eloglang.dutch
+++ b/resources/eloglang.dutch
@@ -466,3 +466,8 @@ Last %d hours = Laatste %d uur
 Invalid URL = Ongeldige URL
 Attribute "%s" is not allowed in config file = Attribuut "%s" is niet toegestaan in het configuratiebestand
 Only user <b>%s</b> can delete this entry = Alleen gebruiker <b>%s</b> kan dit bericht verwijderen
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.french b/resources/eloglang.french
index c8117ed7..5a359ac1 100755
--- a/resources/eloglang.french
+++ b/resources/eloglang.french
@@ -464,3 +464,8 @@ Last %d hours =  %d derni
 Invalid URL = URL invalide
 Attribute "%s" is not allowed in config file = L'attribut  "%s" n'est pas autorisé dans le fichier de configuration
 Only user <b>%s</b> can delete this entry = Seul l'utilisateur <b>%s</b> peut supprimer cette entrée
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.german b/resources/eloglang.german
index 9ee6228c..986dc06d 100755
--- a/resources/eloglang.german
+++ b/resources/eloglang.german
@@ -463,3 +463,5 @@ Last %d hours = Letzte %d Stunden
 Invalid URL = Ungültige URL
 Attribute "%s" is not allowed in config file = Das Attribut "%s" ist in der Konfigurationsdatei nicht erlaubt 
 Only user <b>%s</b> can delete this entry = Nur der Benutzer <b>%s</b> kann diesen Entrag löschen
+File system full, ELOG cannot continue to work = Dateisystem voll, ELOG kann nicht weiterarbeiten
+
diff --git a/resources/eloglang.italian b/resources/eloglang.italian
index 05388fc5..0edc1e96 100755
--- a/resources/eloglang.italian
+++ b/resources/eloglang.italian
@@ -466,3 +466,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese
index 71e4f61a..74d76c74 100755
--- a/resources/eloglang.japanese
+++ b/resources/eloglang.japanese
@@ -467,3 +467,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.ru_CP1251 b/resources/eloglang.ru_CP1251
index a11945e1..3a9c3595 100644
--- a/resources/eloglang.ru_CP1251
+++ b/resources/eloglang.ru_CP1251
@@ -472,3 +472,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish
index 1c957c26..7ca91cdf 100755
--- a/resources/eloglang.spanish
+++ b/resources/eloglang.spanish
@@ -469,3 +469,8 @@ Only user <b>%s</b> can delete this entry = S
 
 
 
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish
index 84aaccfa..d499162e 100644
--- a/resources/eloglang.swedish
+++ b/resources/eloglang.swedish
@@ -475,3 +475,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish
index 08e6c2d3..7629a30f 100755
--- a/resources/eloglang.turkish
+++ b/resources/eloglang.turkish
@@ -470,3 +470,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312
index 79dcf192..1b6f2ff8 100644
--- a/resources/eloglang.zh_CN-GB2312
+++ b/resources/eloglang.zh_CN-GB2312
@@ -469,3 +469,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8
index 747b0fdb..ca8e2c32 100644
--- a/resources/eloglang.zh_CN-UTF8
+++ b/resources/eloglang.zh_CN-UTF8
@@ -469,3 +469,4 @@ Last %d hours =
 Invalid URL = 
 Attribute "%s" is not allowed in config file = 
 Only user <b>%s</b> can delete this entry = 
+File system full, ELOG cannot continue to work = 
diff --git a/src/elog.c b/src/elog.c
index c60bfa00..545c224d 100755
--- a/src/elog.c
+++ b/src/elog.c
@@ -9,7 +9,7 @@
 
 \********************************************************************/
 
-#define VERSION "2.7.7"
+#define VERSION "2.7.8"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */
diff --git a/src/elogd.c b/src/elogd.c
index cb835f7f..9c64a48e 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -9,7 +9,7 @@
  \********************************************************************/
 
 /* Version of ELOG */
-#define VERSION "2.7.7"
+#define VERSION "2.7.8"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */
@@ -7105,7 +7105,8 @@ int scan_attributes(char *logbook)
 /* scan configuration file for attributes and fill attr_list, attr_options
  and attr_flags arrays */
 {
-   char list[10000], str[NAME_LENGTH], str2[NAME_LENGTH], type[NAME_LENGTH], tmp_list[MAX_N_ATTR][NAME_LENGTH];
+   char list[10000], str[NAME_LENGTH], str2[NAME_LENGTH], type[NAME_LENGTH],
+       tmp_list[MAX_N_ATTR][NAME_LENGTH];
    int i, j, n, m, n_options;
 
    if (getcfg(logbook, "Attributes", list, sizeof(list))) {
@@ -7282,7 +7283,6 @@ void show_plain_header(int size, char *file_name)
       rsprintf("Connection: Keep-Alive\r\n");
       rsprintf("Keep-Alive: timeout=60, max=10\r\n");
    }
-
    // rsprintf("Pragma: no-cache\r\n");
    rsprintf("Expires: Fri, 01 Jan 1983 00:00:00 GMT\r\n");
    rsprintf("Content-Type: text/plain\r\n");
@@ -9318,7 +9318,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
       sprintf(str, "Preset on first reply %s", attr_list[index]);
       if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0 && breply) {
          if (orig_tag[0] == 0) {
-            if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
+            if (!breedit || (breedit && i == 2)) {      /* subst on reedit only if preset is under condition */
 
                /* do not format date for date attributes */
                i = build_subst_list(lbs, slist, svalue, attrib, (attr_flags[index] & (AF_DATE | AF_DATETIME))
@@ -9786,8 +9786,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
    rsprintf("   document.form1.submit();\n");
    rsprintf("}\n\n");
 
-   if (enc_selected != 2 && !getcfg(lbs->name, "Message height", str, sizeof(str)) && 
-                            !getcfg(lbs->name, "Message width", str, sizeof(str))) {
+   if (enc_selected != 2 && !getcfg(lbs->name, "Message height", str, sizeof(str)) &&
+       !getcfg(lbs->name, "Message width", str, sizeof(str))) {
       /* javascript for resizing edit box */
       rsprintf("\nfunction init_resize()\n");
       rsprintf("{\n");
@@ -9902,7 +9902,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
       strcpy(script_onload, "document.form1.Text.focus();");
 
    if (enc_selected == 0) {
-      if (!getcfg(lbs->name, "Message height", str, sizeof(str)) && 
+      if (!getcfg(lbs->name, "Message height", str, sizeof(str)) &&
           !getcfg(lbs->name, "Message width", str, sizeof(str))) {
          strcat(script_onload, "elKeyInit();init_resize();");
          strcat(script_onfocus, "elKeyInit();");
@@ -9912,7 +9912,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
    } else if (enc_selected == 2 && fckedit_exist) {
       strcat(script_onload, "initFCKedit();");
    } else if (enc_selected == 1) {
-      if (!getcfg(lbs->name, "Message height", str, sizeof(str)) && 
+      if (!getcfg(lbs->name, "Message height", str, sizeof(str)) &&
           !getcfg(lbs->name, "Message width", str, sizeof(str)))
          strcat(script_onload, "init_resize();");
    }
@@ -10943,8 +10943,9 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
             rsprintf("<textarea rows=%d cols=%d wrap=hard %s name=\"Text\" onChange=\"mod();\">\n", height,
                      width, str);
          else
-            rsprintf("<textarea rows=%d cols=%d %s name=\"Text\" onChange=\"mod();\" style=\"width:100%%;\">\n",
-                     height, width, str);
+            rsprintf
+                ("<textarea rows=%d cols=%d %s name=\"Text\" onChange=\"mod();\" style=\"width:100%%;\">\n",
+                 height, width, str);
 
          if (isparam("nsel")) {
             rsprintf("- %s -\n", loc("keep original text"));
@@ -17566,7 +17567,7 @@ void display_reply(LOGBOOK * lbs, int message_id, int printable, int expand, int
    int status, size;
 
    text = xmalloc(TEXT_SIZE);
-   attachment = xmalloc(MAX_PATH_LENGTH*MAX_ATTACHMENTS);
+   attachment = xmalloc(MAX_PATH_LENGTH * MAX_ATTACHMENTS);
    attrib = xmalloc(MAX_N_ATTR * NAME_LENGTH);
    date = xmalloc(80);
    in_reply_to = xmalloc(80);
@@ -17580,7 +17581,7 @@ void display_reply(LOGBOOK * lbs, int message_id, int printable, int expand, int
    reply_to[0] = 0;
    size = TEXT_SIZE;
    status = el_retrieve(lbs, message_id, date, attr_list, (void *) attrib, lbs->n_attr, text, &size,
-                        in_reply_to, reply_to, (char (*)[256])attachment, encoding, locked_by);
+                        in_reply_to, reply_to, (char (*)[256]) attachment, encoding, locked_by);
 
    if (status != EL_SUCCESS) {
       xfree(text);
@@ -17596,8 +17597,8 @@ void display_reply(LOGBOOK * lbs, int message_id, int printable, int expand, int
 
    display_line(lbs, message_id, 0, "threaded", expand, level, printable, n_line, FALSE, FALSE, date,
                 in_reply_to, reply_to, n_attr_disp, disp_attr, NULL, (void *) attrib, lbs->n_attr, text,
-                show_text, (char (*)[256])attachment, encoding, 0, NULL, locked_by, highlight, &re_buf[0], highlight_mid,
-                absolute_link);
+                show_text, (char (*)[256]) attachment, encoding, 0, NULL, locked_by, highlight, &re_buf[0],
+                highlight_mid, absolute_link);
 
    if (reply_to[0]) {
       p = reply_to;
@@ -18968,8 +18969,8 @@ void highlight_searchtext(regex_t * re_buf, char *src, char *dst, int hidden)
 }
 
 /*------------------------------------------------------------------*/
- 
-time_t search_last_reply(LOGBOOK *lbs, int *message_id)
+
+time_t search_last_reply(LOGBOOK * lbs, int *message_id)
 {
    char reply_to[MAX_REPLY_TO * 10], date[80];
    int n_reply, i, id;
@@ -18987,10 +18988,10 @@ time_t search_last_reply(LOGBOOK *lbs, int *message_id)
       return lt;
    }
 
-   n_reply = strbreak(reply_to, (char (*)[NAME_LENGTH])list, MAX_REPLY_TO, ",", FALSE);
+   n_reply = strbreak(reply_to, (char (*)[NAME_LENGTH]) list, MAX_REPLY_TO, ",", FALSE);
    last = lt;
    for (i = 0; i < n_reply; i++) {
-      id = atoi(list+i*NAME_LENGTH);
+      id = atoi(list + i * NAME_LENGTH);
       lt = search_last_reply(lbs, &id);
       if (lt > last) {
          last = lt;
@@ -19000,7 +19001,7 @@ time_t search_last_reply(LOGBOOK *lbs, int *message_id)
 
    xfree(list);
 
-   return last;   
+   return last;
 }
 
 /*------------------------------------------------------------------*/
@@ -22168,8 +22169,8 @@ void submit_elog(LOGBOOK * lbs)
             strcpy(attrib[i], subst_str);
          }
       }
-   } 
-   
+   }
+
    /* subst attributes for edits */
    if (isparam("edit_id")) {
       for (index = 0; index < n_attr; index++) {
@@ -24600,7 +24601,7 @@ int is_file_system_full(char *file_name)
    n = write(fh, buf, sizeof(buf));
    close(fh);
    remove(str);
-   return n < (int)sizeof(buf);
+   return n < (int) sizeof(buf);
 }
 
 /*------------------------------------------------------------------*/