diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index a688fba3..254595d9 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -1286,7 +1286,10 @@ gam <UserTypeEntity> untrash messages query <QueryGmail> [doit] [max_to_untrash|
 
 gam <UserTypeEntity> show gmailprofile [todrive]
 
-gam <UserTypeEntity> sendemail [recipient <EmailAddress>] [subject <String>] [body <String>]
+gam <UserTypeEntity> draftemail [recipient <EmailAddress>] [subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
+gam <UserTypeEntity> importemail [recipient <EmailAddress>] [subject <String> [(message <String>)|(file <FileName> [charset <Charset>])]]
+gam <UserTypeEntity> insertemail [recipient <EmailAddress>] [subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
+gam <UserTypeEntity> sendemail [recipient <EmailAddress>] [subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
 
 gam <UserTypeEntity> create|add delegate|delegates <EmailAddress>
 gam <UserTypeEntity> delegate|delegates to <EmailAddress>
diff --git a/src/gam.py b/src/gam.py
index 9f92e916..8adc37ea 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -1074,7 +1074,7 @@ def callGAPI(service, function,
         continue
       systemErrorExit(4, str(e))
     except (httplib2.ServerNotFoundError, RuntimeError) as e:
-      if (n != retries):
+      if n != retries:
         service._http.connections = {}
         waitOnFailure(n, retries, str(e))
         continue
@@ -5351,12 +5351,13 @@ def sendOrDropEmail(users, method='send'):
   i = 4
   while i < len(sys.argv):
     myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'body':
+    if myarg == 'message':
       body = sys.argv[i+1]
       i += 2
-    elif myarg == 'bodyfile':
-      body = readFile(sys.argv[i+1])
-      i += 2
+    elif myarg == 'file':
+      filename = sys.argv[i+1]
+      i, encoding = getCharSet(i+2)
+      body = readFile(filename, encoding=encoding)
     elif myarg == 'subject':
       subject = sys.argv[i+1]
       i += 2
@@ -10951,8 +10952,8 @@ def send_email(subject, body, recipient=None, sender=None, method='send', labels
     api_body = {'message': api_body}
   elif method in ['insert', 'import']:
     kwargs['internalDateSource'] = 'dateHeader'
-  if method == 'import':
-    method = 'import_'
+    if method == 'import':
+      method = 'import_'
   callGAPI(resource, method, userId=userId, body=api_body, **kwargs)
 
 def addFieldToFieldsList(fieldName, fieldsChoiceMap, fieldsList):