diff --git a/mystic/bbs_cfg_echomail.pas b/mystic/bbs_cfg_echomail.pas
index 6f7b464..e9b0a5a 100644
--- a/mystic/bbs_cfg_echomail.pas
+++ b/mystic/bbs_cfg_echomail.pas
@@ -8,7 +8,6 @@ Uses
   BBS_Core,
   BBS_Records;
 
-Function  GetNodeByIndex       (Num: LongInt; Var TempNode: RecEchoMailNode) : Boolean;
 Procedure AddExportByBase      (Var MBase: RecMessageBase; Idx: LongInt);
 Procedure RemoveExportFromBase (Var MBase: RecMessageBase; Idx: LongInt);
 
@@ -108,29 +107,6 @@ Begin
   Close (MBaseFile);
 End;
 
-Function GetNodeByIndex (Num: LongInt; Var TempNode: RecEchoMailNode) : Boolean;
-Var
-  F : File;
-Begin
-  Result := False;
-
-  Assign (F, bbsCfg.DataPath + 'echonode.dat');
-
-  If Not ioReset(F, SizeOf(RecEchoMailNode), fmRWDN) Then Exit;
-
-  While Not Eof(F) Do Begin
-    ioRead(F, TempNode);
-
-    If TempNode.Index = Num Then Begin
-      Result := True;
-
-      Break;
-    End;
-  End;
-
-  Close (F);
-End;
-
 Procedure EditSessionInfo (Var Node: RecEchoMailNode);
 Var
   Box   : TAnsiMenuBox;
diff --git a/mystic/bbs_database.pas b/mystic/bbs_database.pas
index 6d61154..1a803d8 100644
--- a/mystic/bbs_database.pas
+++ b/mystic/bbs_database.pas
@@ -66,8 +66,10 @@ Function IsThisUser             (U: RecUser; Str: String) : Boolean;
 
 // ECHOMAIL
 
-Function GetFTNBundleExt (IncOnly: Boolean; Str: String) : String;
+Function GetFTNPKTName    : String;
+Function GetFTNBundleExt  (IncOnly: Boolean; Str: String) : String;
 Function GetNodeByAddress (Addr: String; Var TempNode: RecEchoMailNode) : Boolean;
+Function GetNodeByIndex   (Num: LongInt; Var TempNode: RecEchoMailNode) : Boolean;
 Function SaveEchoMailNode (Var TempNode: RecEchoMailNode) : Boolean;
 
 Implementation
@@ -722,6 +724,40 @@ Begin
   Close (F);
 End;
 
+Function GetFTNPKTName : String;
+Var
+  Hour, Min, Sec, hSec  : Word;
+  Year, Month, Day, DOW : Word;
+Begin
+  GetTime (Hour, Min, Sec, hSec);
+  GetDate (Year, Month, Day, DOW);
+
+  Result := strZero(Day) + strZero(Hour) + strZero(Min) + strZero(Sec);
+End;
+
+Function GetNodeByIndex (Num: LongInt; Var TempNode: RecEchoMailNode) : Boolean;
+Var
+  F : File;
+Begin
+  Result := False;
+
+  Assign (F, bbsCfg.DataPath + 'echonode.dat');
+
+  If Not ioReset(F, SizeOf(RecEchoMailNode), fmRWDN) Then Exit;
+
+  While Not Eof(F) Do Begin
+    ioRead(F, TempNode);
+
+    If TempNode.Index = Num Then Begin
+      Result := True;
+
+      Break;
+    End;
+  End;
+
+  Close (F);
+End;
+
 Initialization
 
   bbsCfgStatus := GetBaseConfiguration(True, bbsCfg);
diff --git a/mystic/mis_client_binkp.pas b/mystic/mis_client_binkp.pas
index 232282d..3077040 100644
--- a/mystic/mis_client_binkp.pas
+++ b/mystic/mis_client_binkp.pas
@@ -927,6 +927,9 @@ Begin
     If Queue.Add(True, OutPath, DirInfo.Name, FileNewExt(DirInfo.Name, 'pkt')) Then
       Queue.QData[Queue.QSize]^.Extra := OutPath;
 
+    //If Queue.Add(True, OutPath, DirInfo.Name, FileNewExt(GetFTNPktName, 'pkt')) Then
+    //  Queue.QData[Queue.QSize]^.Extra := OutPath;
+
     FindNext (DirInfo);
   End;
 
diff --git a/mystic/mutil_common.pas b/mystic/mutil_common.pas
index 5cad59e..0ebe0bb 100644
--- a/mystic/mutil_common.pas
+++ b/mystic/mutil_common.pas
@@ -54,11 +54,9 @@ Function  GetMBaseByTag      (Tag: String; Var TempBase: RecMessageBase) : Boole
 Function  GetMBaseByNetZone  (Zone: Word; Var TempBase: RecMessageBase) : Boolean;
 Function  MessageBaseOpen    (Var Msg: PMsgBaseABS; Var Area: RecMessageBase) : Boolean;
 Function  SaveMessage        (mArea: RecMessageBase; mFrom, mTo, mSubj: String; mAddr: RecEchoMailAddr; mText: RecMessageText; mLines: Integer) : Boolean;
-Function  GetFTNPKTName      : String;
 Function  GetFTNArchiveName  (Orig, Dest: RecEchoMailAddr) : String;
 Function  GetFTNFlowName     (Dest: RecEchoMailAddr) : String;
 Function  GetFTNOutPath      (EchoNode: RecEchoMailNode) : String;
-Function  GetNodeByIndex     (Num: LongInt; Var TempNode: RecEchoMailNode) : Boolean;
 Function  GetNodeByRoute     (Dest: RecEchoMailAddr; Var TempNode: RecEchoMailNode) : Boolean;
 Function  IsValidAKA         (Zone, Net, Node, Point: Word) : Boolean;
 
@@ -382,17 +380,6 @@ Begin
   Result := True;
 End;
 
-Function GetFTNPKTName : String;
-Var
-  Hour, Min, Sec, hSec  : Word;
-  Year, Month, Day, DOW : Word;
-Begin
-  GetTime (Hour, Min, Sec, hSec);
-  GetDate (Year, Month, Day, DOW);
-
-  Result := strZero(Day) + strZero(Hour) + strZero(Min) + strZero(Sec);
-End;
-
 Function GetFTNArchiveName (Orig, Dest: RecEchoMailAddr) : String;
 Var
   Net  : LongInt;
@@ -445,29 +432,6 @@ Begin;
     Result := Result + strI2H((EchoNode.Address.Net SHL 16) OR EchoNode.Address.Node, 8) + '.pnt' + PathChar;
 End;
 
-Function GetNodeByIndex (Num: LongInt; Var TempNode: RecEchoMailNode) : Boolean;
-Var
-  F : File;
-Begin
-  Result := False;
-
-  Assign (F, bbsCfg.DataPath + 'echonode.dat');
-
-  If Not ioReset(F, SizeOf(RecEchoMailNode), fmRWDN) Then Exit;
-
-  While Not Eof(F) Do Begin
-    ioRead(F, TempNode);
-
-    If TempNode.Index = Num Then Begin
-      Result := True;
-
-      Break;
-    End;
-  End;
-
-  Close (F);
-End;
-
 Function GetNodeByRoute (Dest: RecEchoMailAddr; Var TempNode: RecEchoMailNode) : Boolean;
 
   Function IsMatch (Str: String) : Boolean;