Merge remote-tracking branch 'upstream/master' into row-focus

cmcnulty

2013-11-04 5a870688b082ec958c99a757139dd2e26b1f8233

 program/js/editor.js

@@ -162,7 +162,7 @@
  for (i in files) {
    att = files[i];
    if (att.complete && att.mimetype.startsWith('image/')) {
      list.push([att.name, rcmail.env.comm_path+'&_action=display-attachment&_file='+i+'&_id='+rcmail.env.compose_id]);
      list.push([att.name, rcmail.env.comm_path+'&_id='+rcmail.env.compose_id+'&_action=display-attachment&_file='+i]);
    }
  }