diff --git a/windows/src/engine/tsysinfo/UfrmEmail.pas b/windows/src/engine/tsysinfo/UfrmEmail.pas
index 0999e7f2c7..ec096cc057 100644
--- a/windows/src/engine/tsysinfo/UfrmEmail.pas
+++ b/windows/src/engine/tsysinfo/UfrmEmail.pas
@@ -7,12 +7,12 @@
 
   Modified Date:    8 Jun 2012
   Authors:          mcdurdin
-  Related Files:    
-  Dependencies:     
+  Related Files:
+  Dependencies:
 
-  Bugs:             
-  Todo:             
-  Notes:            
+  Bugs:
+  Todo:
+  Notes:
   History:          13 May 2005 - mcdurdin - Integrated into kmshell from tsysinfo
                     16 Aug 2005 - mcdurdin - Add privacy statement
                     20 Jul 2008 - mcdurdin - I1554 - Don't require password for tsysinfo
@@ -136,6 +136,11 @@ begin
       Request.UrlPath := API_Path_SubmitDiag;
 
       Upload;
+      if Response.StatusCode = 413 then
+      begin
+        ShowMessage('The diagnostic report file was too large: '+IntToStr(Response.StatusCode)+ '. Contact us via the Keyman Community Forum for help.');
+        Exit;
+      end;
       if Response.StatusCode <> 200 then
       begin
         ShowMessage('The report was not successfully sent. An error was returned: '+IntToStr(Response.StatusCode));
diff --git a/windows/src/engine/tsysinfo/sysinfo_main.pas b/windows/src/engine/tsysinfo/sysinfo_main.pas
index 3f411e36f8..b1916be9a7 100644
--- a/windows/src/engine/tsysinfo/sysinfo_main.pas
+++ b/windows/src/engine/tsysinfo/sysinfo_main.pas
@@ -343,56 +343,17 @@ end;
 procedure TfrmDiagnostics.mnuSendToKeymanClick(Sender: TObject);
 var
   ffilename: string;
-  i: Integer;
-  f: TSearchRec;
-  FTotalSize: Int64;
-  FSavedFileList: string;
-  FDeleteFiles: Boolean;
 begin
   ffilename := TempFileName('.tsi');
-
-  FTotalSize := 0;
-
-  for i := 0 to FSIList.Files.Count - 1 do
-  begin
-    if FindFirst(FSIList.Files[i], 0, f) = 0 then
-    begin
-      FTotalSize := FTotalSize + f.Size;
-      FindClose(f);
-    end
-  end;
-
-  FSavedFileList := FSIList.Files.Text;
-
-  FDeleteFiles := False; // I2240
-
-  if FTotalSize > 1024 * 1024 * 8 then // 8MB
-  begin
-    case MessageDlg('The attached files are very large (' +
-      FileSizeKB(FTotalSize) +
-      ').  Do you want to send them - this may take some time?', mtConfirmation,
-      mbYesNoCancel, 0) of
-      mrYes:
-        FDeleteFiles := True;
-      mrNo:
-        FSIList.Files.Text := '';
-      mrCancel:
-        Exit;
-    end;
-  end
-  else
-    FDeleteFiles := True; // I2240
+  // No longer sending log files to Keyman via this upload method
+  FSIList.Files.Clear;
 
   FSIList.Save(ffilename);
 
-  FSIList.Files.Text := FSavedFileList;
-
   with TfrmEmail.Create(Self) do
     try
       AttachFile := ffilename;
       if ShowModal = mrOk then
-        if FDeleteFiles then
-          DeleteDiagFiles; // I2240
     finally
       DeleteFile(ffilename);
       Free;