diff --git a/TODO b/TODO
index 0747adec5f6c8b274ca32dc389ed2878f90d96dd..1fffb9d24559c9ee5c5bd3ce073a1592381805c7 100644
--- a/TODO
+++ b/TODO
@@ -9,9 +9,8 @@ overlay reminder showing what each one does :p
 
 key/option/signal/timeout to totally reload filelist (rescan directories etc)
 
---draw-actions doesn't work. It will miss some actions, and even if not it
-can't display anything anyway because it causes a nice abort at startup if
---action is defined.
+--draw-actions doesn't work too fine. It conflicts with --draw-filename and
+misses some actions if there are non-defined actions in between
 
 The "No more slides left in show" bug was fixed, but now there's a rare
 condition (viewing a few images, removing them externally while viewing,
diff --git a/src/imlib.c b/src/imlib.c
index 1b2ae12d4f5a4194ad6fd018bf8f4ccb825c0a1c..87352a9386c0278d15a61c55075c70c78aa48149 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1210,15 +1210,15 @@ feh_draw_actions(winwidget w)
    static DATA8 atab[256];
    int i = 0;
    int num_actions = 0;
-   
+
    D_ENTER(4);
 
-// count the number of defined actions
+// count the number of defined actions (this method sucks)
    for (num_actions=0;opt.actions[num_actions];num_actions++)
-   	;
+      ;
    if (num_actions == 0)
       return;
-   
+
    if ((!w->file) || (!FEH_FILE(w->file->data))
        || (!FEH_FILE(w->file->data)->filename))
       D_RETURN_(4);
@@ -1238,17 +1238,16 @@ feh_draw_actions(winwidget w)
       D_RETURN_(4);
    }
 
-
    gib_imlib_get_text_size(fn, "defined actions:", NULL, &tw, &th,
                            IMLIB_TEXT_TO_RIGHT);
 // Check for the widest line
-   max_tw = tw; 
-   for (i=0;opt.actions[i];i++) {
-   gib_imlib_get_text_size(fn, opt.actions[i], NULL, &tw, &th,
-                           IMLIB_TEXT_TO_RIGHT);
-   	if (tw>max_tw) {
-	   max_tw = tw;
-	}
+   max_tw = tw;
+
+   for (i = 0; opt.actions[i]; i++) {
+      gib_imlib_get_text_size(fn, opt.actions[i], NULL, &tw, &th,
+                              IMLIB_TEXT_TO_RIGHT);
+      if (tw > max_tw)
+         max_tw = tw;
    }
 
    tw = max_tw;
@@ -1271,12 +1270,10 @@ feh_draw_actions(winwidget w)
    gib_imlib_text_draw(im, fn, NULL, 2, 2, "defined actions:",
                        IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
 
-   for(i=0;i<num_actions;i++)
+   for(i = 0; i < num_actions; i++)
    {
-//    compose a line containing an index, a colon followed by the
-//    action.
       char index[1];
-      char line[strlen(opt.actions[i])+5];
+       char *line = emalloc(strlen(opt.actions[i])+5);
       sprintf(index, "%d", i);
       strcpy(line, index);
       strcat(line, ": ");